From 5ffd88a782e28c9a6af60e61a4064389d0b80d93 Mon Sep 17 00:00:00 2001
From: edschofield <edschofield@localhost>
Date: Mon, 27 Feb 2006 22:47:42 +0000
Subject: More judicious calling of dot() from matrix.__mul__

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

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

diff --git a/numpy/core/defmatrix.py b/numpy/core/defmatrix.py
index 61d23eac9..b22efc108 100644
--- a/numpy/core/defmatrix.py
+++ b/numpy/core/defmatrix.py
@@ -145,7 +145,11 @@ class matrix(N.ndarray):
         return truend
     
     def __mul__(self, other):
-        return N.dot(self, other)
+        if isinstance(other, N.ndarray) or N.isscalar(other) \
+                or not hasattr(other, '__rmul__'):
+            return N.dot(self, other)
+        else:
+            return NotImplemented
     
     def __rmul__(self, other):
         return N.dot(other, self)
@@ -190,7 +194,7 @@ class matrix(N.ndarray):
             raise TypeError, "exponent must be an integer"
 
     def __rpow__(self, other):
-        raise NotImplementedError
+        return NotImplemented
 
     def __repr__(self):
         return repr(self.__array__()).replace('array','matrix')
-- 
cgit v1.2.1