diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/dft/fftpack.py | 3 | ||||
| -rw-r--r-- | numpy/lib/machar.py | 1 | ||||
| -rw-r--r-- | numpy/lib/scimath.py | 15 | ||||
| -rw-r--r-- | numpy/lib/shape_base.py | 3 | ||||
| -rw-r--r-- | numpy/lib/twodim_base.py | 3 |
5 files changed, 14 insertions, 11 deletions
diff --git a/numpy/dft/fftpack.py b/numpy/dft/fftpack.py index eebbc73a5..6310ca071 100644 --- a/numpy/dft/fftpack.py +++ b/numpy/dft/fftpack.py @@ -26,7 +26,8 @@ __all__ = ['fft','inverse_fft', 'ifft', 'real_fft', 'refft', 'fft2d', 'inverse_fft2d', 'real_fftnd', 'real_fft2d', 'inverse_real_fftnd', 'inverse_real_fft2d','fftn','ifftn'] -from numpy.core import * +from numpy.core import asarray, zeros, swapaxes, shape, Complex, conjugate, \ + Float, take import fftpack_lite as fftpack from helper import * diff --git a/numpy/lib/machar.py b/numpy/lib/machar.py index 249dfddad..22560e598 100644 --- a/numpy/lib/machar.py +++ b/numpy/lib/machar.py @@ -7,7 +7,6 @@ __all__ = ['MachAr'] -from numpy.core.numeric import array from numpy.core.oldnumeric import any # Need to speed this up...especially for longfloat diff --git a/numpy/lib/scimath.py b/numpy/lib/scimath.py index 1875647aa..c33de5ccc 100644 --- a/numpy/lib/scimath.py +++ b/numpy/lib/scimath.py @@ -7,21 +7,22 @@ __all__ = ['sqrt', 'log', 'log2', 'logn','log10', 'power', 'arccos', 'arcsin', 'arctanh'] import numpy.core.numeric as nx -from numpy.core.numeric import * +import numpy.core.numerictypes as nt +from numpy.core.numeric import asarray, any +from numpy.lib.type_check import isreal, asscalar -from type_check import isreal, asscalar __all__.extend([key for key in dir(nx.umath) if key[0] != '_' and key not in __all__]) -_ln2 = log(2.0) +_ln2 = nx.log(2.0) def _tocomplex(arr): - if isinstance(arr.dtype, (nx.single, nx.byte, nx.short, nx.ubyte, - nx.ushort)): - return arr.astype(nx.csingle) + if isinstance(arr.dtype, (nt.single, nt.byte, nt.short, nt.ubyte, + nt.ushort)): + return arr.astype(nt.csingle) else: - return arr.astype(nx.cdouble) + return arr.astype(nt.cdouble) def _fix_real_lt_zero(x): x = asarray(x) diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py index b6ace7dd8..28ea0b1d3 100644 --- a/numpy/lib/shape_base.py +++ b/numpy/lib/shape_base.py @@ -4,7 +4,8 @@ __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack', 'apply_along_axis', 'repmat', 'kron'] import numpy.core.numeric as _nx -from numpy.core.numeric import * +from numpy.core.numeric import asarray, zeros, newaxis, outerproduct, \ + concatenate, isscalar, array from numpy.core.oldnumeric import product, reshape def apply_along_axis(func1d,axis,arr,*args): diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py index 2f8069a8b..3122d11a3 100644 --- a/numpy/lib/twodim_base.py +++ b/numpy/lib/twodim_base.py @@ -5,7 +5,8 @@ __all__ = ['diag','eye','fliplr','flipud','rot90','tri','triu','tril', 'vander'] -from numpy.core.numeric import * +from numpy.core.numeric import asanyarray, int_, equal, subtract, arange, \ + zeros, arange, greater_equal, multiply, ones, asarray import sys def fliplr(m): |