diff options
Diffstat (limited to 'numpy/core/defmatrix.py')
| -rw-r--r-- | numpy/core/defmatrix.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py index 72b0aa667..f6ecbcaad 100644 --- a/numpy/core/defmatrix.py +++ b/numpy/core/defmatrix.py @@ -154,12 +154,12 @@ class matrix(N.ndarray): def __mul__(self, other): - try : - rhs = asmatrix(other) - except : - return NotImplemented - else : - return N.dot(self, rhs) + if not isscalar(other) : + try : + other = asmatrix(other) + except : + return NotImplemented + return N.dot(self, other) def __rmul__(self, other): return N.dot(other, self) |