Fix matrix multiply to return error when has is a 1-D vector. Fixes ticket #473

1 files changed, 5 insertions, 4 deletions

diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py
index 3c8635ca8..72b0aa667 100644
--- a/numpy/core/defmatrix.py
+++ b/numpy/core/defmatrix.py
@@ -154,11 +154,12 @@ class matrix(N.ndarray):
 
 
     def __mul__(self, other):
-        if isinstance(other, N.ndarray) or N.isscalar(other) or \
-               not hasattr(other, '__rmul__'):
-            return N.dot(self, other)
-        else:
+        try :
+            rhs = asmatrix(other)
+        except :
             return NotImplemented
+        else :
+            return N.dot(self, rhs)
 
     def __rmul__(self, other):
         return N.dot(other, self)