diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-05 06:44:20 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-05 06:44:20 +0000 |
| commit | 04d79b539391064f6a81fba9ffa45e6371ffcedd (patch) | |
| tree | be47fa1a0fe4a0a41bfde371dfd0d0d16c397d1e /numpy/oldnumeric/matrix.py | |
| parent | d6eb562b8d4b37be1f2c6743bae5ea520703da64 (diff) | |
| download | numpy-04d79b539391064f6a81fba9ffa45e6371ffcedd.tar.gz | |
Fixes for the recent change to oldnumeric
Diffstat (limited to 'numpy/oldnumeric/matrix.py')
| -rw-r--r-- | numpy/oldnumeric/matrix.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/numpy/oldnumeric/matrix.py b/numpy/oldnumeric/matrix.py index d0a3b888b..2b3842c8d 100644 --- a/numpy/oldnumeric/matrix.py +++ b/numpy/oldnumeric/matrix.py @@ -4,13 +4,11 @@ __all__ = ['UserArray', 'squeeze', 'Matrix', 'asarray', 'dot', 'k', 'Numeric', ' import string import types -import numpy.oldnumeric as Numeric from user_array import UserArray, asarray +import numpy.oldnumeric as Numeric from numpy.oldnumeric import dot, identity, multiply -from mlab import squeeze import linear_algebra as LinearAlgebra - -from numpy import matrix as Matrix +from numpy import matrix as Matrix, squeeze # Hidden names that will be the same. |