diff options
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/defmatrix.py | 2 | ||||
| -rw-r--r-- | numpy/core/fromnumeric.py | 5 | ||||
| -rw-r--r-- | numpy/core/ma.py | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 3 |
4 files changed, 3 insertions, 9 deletions
diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py index e64fd8c6d..58460265a 100644 --- a/numpy/core/defmatrix.py +++ b/numpy/core/defmatrix.py @@ -2,7 +2,6 @@ __all__ = ['matrix', 'bmat', 'mat', 'asmatrix'] import numeric as N from numeric import concatenate, isscalar, binary_repr -import types import string as str_ import sys @@ -238,6 +237,7 @@ class matrix(N.ndarray): over all dimensions. This preserves the orientation of the result as a row or column. """ + # FIXME: should out=None be used here, or should it just be out? return N.ndarray.sum(self, axis, dtype, out=None)._align(axis) def mean(self, axis=None, out=None): diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index e80006a15..1f84a7b18 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -14,10 +14,7 @@ __all__ = ['take', 'reshape', 'choose', 'repeat', 'put', import multiarray as mu import umath as um import numerictypes as nt -from numeric import asarray, array, asanyarray, correlate, outer, concatenate -from umath import sign, absolute, multiply -import numeric as _nx -import sys +from numeric import asarray, array, asanyarray, concatenate _dt_ = nt.sctype2char import types diff --git a/numpy/core/ma.py b/numpy/core/ma.py index fc1e89d7b..420cbd72d 100644 --- a/numpy/core/ma.py +++ b/numpy/core/ma.py @@ -1683,7 +1683,6 @@ def average (a, axis=None, weights=None, returned = 0): d = add.reduce(w, axis) del w elif wsh == (ash[axis],): - ni = ash[axis] r = [newaxis]*len(ash) r[axis] = slice(None, None, 1) w = eval ("w["+ repr(tuple(r)) + "] * ones(ash, float)") @@ -1708,7 +1707,6 @@ def average (a, axis=None, weights=None, returned = 0): n = add.reduce(a*w, axis) d = add.reduce(w, axis) elif wsh == (ash[axis],): - ni = ash[axis] r = [newaxis]*len(ash) r[axis] = slice(None, None, 1) w = eval ("w["+ repr(tuple(r)) + "] * masked_array(ones(ash, float), mask)") diff --git a/numpy/core/setup.py b/numpy/core/setup.py index ac13f10c8..70dcd5480 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -2,8 +2,7 @@ import imp import os import sys from os.path import join -from glob import glob -from distutils.dep_util import newer,newer_group +from distutils.dep_util import newer FUNCTIONS_TO_CHECK = [ ('expl', 'HAVE_LONGDOUBLE_FUNCS'), |