summaryrefslogtreecommitdiff
path: root/scipy/base/ma.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-12-28 03:17:55 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-12-28 03:17:55 +0000
commit922f7cf07fcce95f510222b464cdc757f40ef57f (patch)
treeddc75cce90be2bff70a0c2863c1b4996f1aadf34 /scipy/base/ma.py
parent4b61fd0dc145083b566028edc691c5f2d1d5936f (diff)
downloadnumpy-922f7cf07fcce95f510222b464cdc757f40ef57f.tar.gz
Added an mlab so that there is one file to replace the old MLab functionality.
Diffstat (limited to 'scipy/base/ma.py')
-rw-r--r--scipy/base/ma.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/scipy/base/ma.py b/scipy/base/ma.py
index 874c62319..691de03dd 100644
--- a/scipy/base/ma.py
+++ b/scipy/base/ma.py
@@ -12,9 +12,8 @@ import string, types, sys
import umath
import oldnumeric
import function_base
-from function_base import amax, amin
from numeric import e, pi, newaxis, ndarray
-from oldnumeric import typecodes
+from oldnumeric import typecodes, amax, amin
from numerictypes import *
import numeric