summaryrefslogtreecommitdiff
path: root/numpy/lib/mlab.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-06-12 22:58:43 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-06-12 22:58:43 +0000
commitfbf0b479604c22e60215bb28cdedabfb821b9d75 (patch)
treeff1c02a4a21aec9998b57d7aff01a34573aa21c2 /numpy/lib/mlab.py
parentb5e35c7c5c715d58aca9638e40098d044b8b8dba (diff)
downloadnumpy-fbf0b479604c22e60215bb28cdedabfb821b9d75.tar.gz
Check-in name-space changes so that numpy.oldnumeric is the compatibility module and numpy does not contain all of the names.
Diffstat (limited to 'numpy/lib/mlab.py')
-rw-r--r--numpy/lib/mlab.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py
index cb634b826..e26761117 100644
--- a/numpy/lib/mlab.py
+++ b/numpy/lib/mlab.py
@@ -3,8 +3,7 @@
from numpy.core.numeric import *
from twodim_base import eye, tri, diag, fliplr, flipud, rot90, tril, triu
-from numpy.core.oldnumeric import amax as max
-from numpy.core.oldnumeric import amin as min
+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
from numpy.core.oldnumeric import cumsum, ptp, mean, std, prod, cumprod, \