summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2009-09-26 17:43:49 +0000
committerPauli Virtanen <pav@iki.fi>2009-09-26 17:43:49 +0000
commit9af578fae9b87fd15415dc641180cd0e4976bbef (patch)
tree7259e367f36eaf8dbbc9299812a50f6d1225d498 /numpy
parent49a78a3dd7e6cf4b98214b975eb08ac93da521e6 (diff)
downloadnumpy-9af578fae9b87fd15415dc641180cd0e4976bbef.tar.gz
Fix remaining references to numpy.core.defmatrix
Diffstat (limited to 'numpy')
-rw-r--r--numpy/add_newdocs.py2
-rw-r--r--numpy/ma/API_CHANGES.txt4
-rw-r--r--numpy/matlib.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index d588cbba0..86f8461e5 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -2749,7 +2749,7 @@ add_newdoc('numpy.core.multiarray', 'ndarray', ('view',
>>> y
matrix([[513]], dtype=int16)
>>> print type(y)
- <class 'numpy.core.defmatrix.matrix'>
+ <class 'numpy.matrixlib.defmatrix.matrix'>
Creating a view on a structured array so it can be used in calculations
diff --git a/numpy/ma/API_CHANGES.txt b/numpy/ma/API_CHANGES.txt
index cd040be69..7452eb5fa 100644
--- a/numpy/ma/API_CHANGES.txt
+++ b/numpy/ma/API_CHANGES.txt
@@ -27,7 +27,7 @@ on the initial data::
[[1 2]
[3 4]]
>>> print type(x._data)
- <class 'numpy.core.defmatrix.matrix'>
+ <class 'numpy.matrixlib.defmatrix.matrix'>
In practice, ``_data`` is implemented as a property, not as an attribute.
@@ -45,7 +45,7 @@ The function ``filled(a)`` returns an array of the same type as ``a._data``::
>>> x = masked_array(numpy.matrix([[1,2],[3,4]]),mask=[[0,0],[0,1]])
>>> y = filled(x)
>>> print type(y)
- <class 'numpy.core.defmatrix.matrix'>
+ <class 'numpy.matrixlib.defmatrix.matrix'>
>>> print y
matrix([[ 1, 2],
[ 3, 999999]])
diff --git a/numpy/matlib.py b/numpy/matlib.py
index 8ce5e69f4..286ac7364 100644
--- a/numpy/matlib.py
+++ b/numpy/matlib.py
@@ -1,5 +1,5 @@
import numpy as np
-from numpy.core.defmatrix import matrix, asmatrix
+from numpy.matrixlib.defmatrix import matrix, asmatrix
# need * as we're copying the numpy namespace
from numpy import *