From 490712cd35dcecfc9423de4bde0b29cb012dda25 Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Wed, 4 Jan 2006 21:05:36 +0000
Subject: More numpy fixes...

---
 numpy/lib/index_tricks.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

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):
-- 
cgit v1.2.1