15 files changed, 56 insertions, 12 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py
index 90f9e687c..d7d5b4371 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -145,6 +145,8 @@ else:
     import random
     import ctypeslib
     import ma
+    import matrx as _mat
+    from matrx import *
 
     # Make these accessible from numpy name-space
     #  but not imported in from numpy import *
@@ -155,5 +157,6 @@ else:
     __all__.extend(['__version__', 'pkgload', 'PackageLoader',
                'show_config'])
     __all__.extend(core.__all__)
+    __all__.extend(_mat.__all__)
     __all__.extend(lib.__all__)
     __all__.extend(['linalg', 'fft', 'random', 'ctypeslib', 'ma'])
diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py
index 469503e25..b7f5f2cb9 100644
--- a/numpy/core/__init__.py
+++ b/numpy/core/__init__.py
@@ -10,7 +10,6 @@ multiarray.set_typeDict(nt.sctypeDict)
 import _sort
 from numeric import *
 from fromnumeric import *
-from defmatrix import *
 import defchararray as char
 import records as rec
 from records import *
@@ -26,7 +25,6 @@ from numeric import absolute as abs
 __all__ = ['char','rec','memmap']
 __all__ += numeric.__all__
 __all__ += fromnumeric.__all__
-__all__ += defmatrix.__all__
 __all__ += rec.__all__
 __all__ += char.__all__
 
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py
index 206c06e66..e1dab3bfa 100644
--- a/numpy/core/tests/test_numeric.py
+++ b/numpy/core/tests/test_numeric.py
@@ -85,10 +85,6 @@ class TestDot(TestCase):
         c2 = dot_(b3, b1)
         assert_almost_equal(c1, c2, decimal=self.N)
 
-    def test_matscalar(self):
-        b1 = matrix(ones((3,3),dtype=complex))
-        assert_equal(b1*1.0, b1)
-
     def test_columnvect1(self):
         b1 = ones((3,1))
         b2 = [5.3]
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):
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 5878b909f..45cc27ead 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -20,7 +20,7 @@ from numpy.core import array, asarray, zeros, empty, transpose, \
         isfinite, size
 from numpy.lib import triu
 from numpy.linalg import lapack_lite
-from numpy.core.defmatrix import matrix_power
+from numpy.matrx.defmatrix import matrix_power
 
 fortran_int = intc
 
diff --git a/numpy/matrx/__init__.py b/numpy/matrx/__init__.py
new file mode 100644
index 000000000..bdc653b06
--- /dev/null
+++ b/numpy/matrx/__init__.py
@@ -0,0 +1,7 @@
+from defmatrix import *
+
+__all__ = defmatrix.__all__
+
+from numpy.testing import Tester
+test = Tester().test
+bench = Tester().bench
diff --git a/numpy/core/defmatrix.py b/numpy/matrx/defmatrix.py
index 354e40060..dfa7e4a8d 100644
--- a/numpy/core/defmatrix.py
+++ b/numpy/matrx/defmatrix.py
@@ -1,9 +1,9 @@
 __all__ = ['matrix', 'bmat', 'mat', 'asmatrix']
 
 import sys
-import numeric as N
-from numeric import concatenate, isscalar, binary_repr, identity, asanyarray
-from numerictypes import issubdtype
+import numpy.core.numeric as N
+from numpy.core.numeric import concatenate, isscalar, binary_repr, identity, asanyarray
+from numpy.core.numerictypes import issubdtype
 
 # make translation table
 _table = [None]*256
diff --git a/numpy/matrx/setup.py b/numpy/matrx/setup.py
new file mode 100644
index 000000000..ca288b96e
--- /dev/null
+++ b/numpy/matrx/setup.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+import os
+
+def configuration(parent_package='', top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('matrx', parent_package, top_path)
+    config.add_data_dir('tests')
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    config = configuration(top_path='').todict()
+    setup(**config)
diff --git a/numpy/matrx/setupscons.py b/numpy/matrx/setupscons.py
new file mode 100644
index 000000000..ca288b96e
--- /dev/null
+++ b/numpy/matrx/setupscons.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+import os
+
+def configuration(parent_package='', top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('matrx', parent_package, top_path)
+    config.add_data_dir('tests')
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    config = configuration(top_path='').todict()
+    setup(**config)
diff --git a/numpy/core/tests/test_defmatrix.py b/numpy/matrx/tests/test_defmatrix.py
index 40728bd29..2cf4914a7 100644
--- a/numpy/core/tests/test_defmatrix.py
+++ b/numpy/matrx/tests/test_defmatrix.py
@@ -1,6 +1,8 @@
 from numpy.testing import *
 from numpy.core import *
-from numpy.core.defmatrix import matrix_power
+from numpy import matrix, asmatrix, bmat
+from numpy.matrx.defmatrix import matrix_power
+from numpy.matrx import mat
 import numpy as np
 
 class TestCtor(TestCase):
diff --git a/numpy/matrx/tests/test_numeric.py b/numpy/matrx/tests/test_numeric.py
new file mode 100644
index 000000000..0b96bb05a
--- /dev/null
+++ b/numpy/matrx/tests/test_numeric.py
@@ -0,0 +1,8 @@
+from numpy.testing import assert_equal, TestCase
+from numpy.core import ones
+from numpy import matrix
+
+class TestDot(TestCase):
+    def test_matscalar(self):
+        b1 = matrix(ones((3,3),dtype=complex))
+        assert_equal(b1*1.0, b1)
diff --git a/numpy/setup.py b/numpy/setup.py
index 4cc7f6f37..3aba00ca2 100644
--- a/numpy/setup.py
+++ b/numpy/setup.py
@@ -14,6 +14,7 @@ def configuration(parent_package='',top_path=None):
     config.add_subpackage('linalg')
     config.add_subpackage('random')
     config.add_subpackage('ma')
+    config.add_subpackage('matrx')
     config.add_subpackage('doc')
     config.add_data_dir('doc')
     config.add_data_dir('tests')
diff --git a/numpy/setupscons.py b/numpy/setupscons.py
index ef1ef8061..f242edc7b 100644
--- a/numpy/setupscons.py
+++ b/numpy/setupscons.py
@@ -19,6 +19,7 @@ def configuration(parent_package='', top_path=None):
     config.add_subpackage('linalg')
     config.add_subpackage('random')
     config.add_subpackage('ma')
+    config.add_subpackage('matrx')
     config.add_data_dir('doc')
     config.add_data_dir('tests')