From e3a18285c362ebe8bdab2bcdefa8b94557f7b93b Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Sat, 24 Mar 2007 23:46:03 +0000
Subject: Fix matrix-scalar multiplication. Add test for case Matrix*1d-vector

---
 numpy/core/defmatrix.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'numpy/core/defmatrix.py')

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)
-- 
cgit v1.2.1