Don't check scalars in matrix mul. There is fast code for them in dotblas.

1 files changed, 4 insertions, 4 deletions

diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py
index b22efc108..e762734e9 100644
--- a/numpy/core/defmatrix.py
+++ b/numpy/core/defmatrix.py
@@ -145,11 +145,11 @@ class matrix(N.ndarray):
         return truend
     
     def __mul__(self, other):
-        if isinstance(other, N.ndarray) or N.isscalar(other) \
-                or not hasattr(other, '__rmul__'):
-            return N.dot(self, other)
-        else:
+        if not isinstance(other, N.ndarray) and \
+               hasattr(other, '__rmul__'):
             return NotImplemented
+        else:
+            return N.dot(self, other)
     
     def __rmul__(self, other):
         return N.dot(other, self)