From fbf0b479604c22e60215bb28cdedabfb821b9d75 Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Mon, 12 Jun 2006 22:58:43 +0000
Subject: Check-in name-space changes so that numpy.oldnumeric is the
 compatibility module and numpy does not contain all of the names.

---
 numpy/lib/mlab.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'numpy/lib/mlab.py')

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, \
-- 
cgit v1.2.1