summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-09-16 07:12:46 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-09-16 07:12:46 +0000
commitfe002b2916a5928463f7c46c5c4875114228bf7f (patch)
tree1f56e956eae72299b91a84b2cf6874f7ec73d4fa /numpy/lib
parentec7f9dcddd216019bcf15d162926c4df6355860e (diff)
downloadnumpy-fe002b2916a5928463f7c46c5c4875114228bf7f.tar.gz
Move matrix class into its own module.
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/index_tricks.py2
-rw-r--r--numpy/lib/tests/test_function_base.py1
-rw-r--r--numpy/lib/tests/test_shape_base.py1
3 files changed, 3 insertions, 1 deletions
diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py
index eeb1d37aa..f6450d305 100644
--- a/numpy/lib/index_tricks.py
+++ b/numpy/lib/index_tricks.py
@@ -14,7 +14,7 @@ from numpy.core.numerictypes import find_common_type
import math
import function_base
-import numpy.core.defmatrix as matrix
+import numpy.matrx as matrix
from function_base import diff
makemat = matrix.matrix
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
index fc8781fda..cfb316074 100644
--- a/numpy/lib/tests/test_function_base.py
+++ b/numpy/lib/tests/test_function_base.py
@@ -4,6 +4,7 @@ from numpy.testing import *
import numpy.lib
from numpy.lib import *
from numpy.core import *
+from numpy import matrix, asmatrix
class TestAny(TestCase):
def test_basic(self):
diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py
index 59c48dba0..66c396324 100644
--- a/numpy/lib/tests/test_shape_base.py
+++ b/numpy/lib/tests/test_shape_base.py
@@ -1,6 +1,7 @@
from numpy.testing import *
from numpy.lib import *
from numpy.core import *
+from numpy import matrix, asmatrix
class TestApplyAlongAxis(TestCase):
def test_simple(self):