summaryrefslogtreecommitdiff
path: root/numpy/lib/scimath.py
diff options
context:
space:
mode:
authorTim Leslie <tim.leslie@gmail.com>2006-03-16 04:05:58 +0000
committerTim Leslie <tim.leslie@gmail.com>2006-03-16 04:05:58 +0000
commit8c9cf9ac2a07e9ebb8dae51a264f708229770624 (patch)
tree6a0f2d4ccb907ca9f7c1068084c901dbce850d18 /numpy/lib/scimath.py
parent5a712837f673a194353113ebad72d5050ad1f68f (diff)
downloadnumpy-8c9cf9ac2a07e9ebb8dae51a264f708229770624.tar.gz
clean up some imports
Diffstat (limited to 'numpy/lib/scimath.py')
-rw-r--r--numpy/lib/scimath.py15
1 files changed, 8 insertions, 7 deletions
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)