summaryrefslogtreecommitdiff
path: root/scipy/base/numeric.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-09-29 22:29:00 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-09-29 22:29:00 +0000
commit615d81479b16a7b2c057fb0ce93c690f3ccd99f4 (patch)
tree54fa5178b8e77ebfe709ffec7799e5bcdbe72bae /scipy/base/numeric.py
parentfe215b7e7eb14e84cfdfe3a5de4196746489f95d (diff)
downloadnumpy-615d81479b16a7b2c057fb0ce93c690f3ccd99f4.tar.gz
Changed names from axxxxx to xxxx_ for types that shadow builtin types.
Diffstat (limited to 'scipy/base/numeric.py')
-rw-r--r--scipy/base/numeric.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py
index d3d5470d1..f13148dcb 100644
--- a/scipy/base/numeric.py
+++ b/scipy/base/numeric.py
@@ -183,7 +183,7 @@ def cross(a, b, axisa=-1, axisb=-1, axisc=-1):
#Use numarray's printing function
from arrayprint import array2string, get_printoptions, set_printoptions
-_typelessdata = [aint, afloat, acomplex]
+_typelessdata = [int_, float_, complex_]
if issubclass(intc, int):
_typelessdata.append(intc)