summaryrefslogtreecommitdiff
path: root/numpy/core/defmatrix.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core/defmatrix.py')
-rw-r--r--numpy/core/defmatrix.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py
index 9234d2f53..65339793a 100644
--- a/numpy/core/defmatrix.py
+++ b/numpy/core/defmatrix.py
@@ -101,6 +101,13 @@ class matrix(N.ndarray):
def __array_finalize__(self, obj):
ndim = self.ndim
+ if (ndim > 2):
+ newshape = tuple([x for x in self.shape if x > 1])
+ ndim = len(newshape)
+ if ndim == 2:
+ self.shape = newshape
+ elif (ndim > 2):
+ raise ValueError, "shape too large to be a matrix."
if ndim == 0:
self.shape = (1,1)
elif ndim == 1: