summaryrefslogtreecommitdiff
path: root/numpy/lib/mlab.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-06-30 20:04:28 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-06-30 20:04:28 +0000
commit7d4c3ed2a0caebf1ce9e0da3473fdbde005699e5 (patch)
treefa4801786b5c59f13deff0bdf1cf25c3c8656224 /numpy/lib/mlab.py
parentec1662fb0182a87ebf39ec476109becfc7a8cdb1 (diff)
downloadnumpy-7d4c3ed2a0caebf1ce9e0da3473fdbde005699e5.tar.gz
Make the default array type float.
Diffstat (limited to 'numpy/lib/mlab.py')
-rw-r--r--numpy/lib/mlab.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py
index 33ee966e5..fd66ecd70 100644
--- a/numpy/lib/mlab.py
+++ b/numpy/lib/mlab.py
@@ -2,7 +2,11 @@
from numpy.core.numeric import *
-from twodim_base import eye, tri, diag, fliplr, flipud, rot90, tril, triu
+from twodim_base import diag, fliplr, flipud, rot90, tril, triu
+
+# use old defaults
+from numpy.oldnumeric import eye, tri
+
from numpy.core.fromnumeric import amax as max, amin as min
from function_base import msort, median, trapz, diff, cov, corrcoef, \
kaiser, blackman, bartlett, hanning, hamming, sinc, angle