diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 21:05:36 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 21:05:36 +0000 |
| commit | 490712cd35dcecfc9423de4bde0b29cb012dda25 (patch) | |
| tree | 56b6ccaac48afc370a189c596d5e9e90ac0254d4 /numpy/lib/index_tricks.py | |
| parent | 7ff852162596a8eaa02ef87730474285b080d594 (diff) | |
| download | numpy-490712cd35dcecfc9423de4bde0b29cb012dda25.tar.gz | |
More numpy fixes...
Diffstat (limited to 'numpy/lib/index_tricks.py')
| -rw-r--r-- | numpy/lib/index_tricks.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index e2c8d2a13..c380df0d8 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -4,13 +4,12 @@ __all__ = ['mgrid','ogrid','r_', 'c_', 'index_exp', 'ix_','ndenumerate'] import sys import types -import numeric as _nx -from numeric import asarray +import numpy.core.numeric as _nx +from numpy.core.numeric import asarray, ScalarType -from type_check import ScalarType import function_base import twodim_base as matrix_base -import matrix +import numpy.core.defmatrix as matrix makemat = matrix.matrix def ix_(*args): |