Add test cases to ensure NotImplemented is passed on

1 files changed, 20 insertions, 0 deletions

diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index faca0c81a..deb269636 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -1631,6 +1631,26 @@ class TestUfuncs(TestCase):
         assert_equal(test.mask, control.mask)
         self.assertTrue(not isinstance(test.mask, MaskedArray))
 
+    def test_treatment_of_NotImplemented(self):
+        "Check we return NotImplemented if ufunc cannot deal with other"
+        a = masked_array([1., 2.], mask=[1, 0])
+        # basic test
+        assert a.__mul__('abc') == NotImplemented  # _MaskedBinaryOperation
+        assert multiply.outer(a, 'abc') == NotImplemented
+        assert a.__div__('abc') == NotImplemented  # _DomainedBinaryOperation
+
+        # also check that rmul of another class can be accessed
+        class MyClass(str):
+            def __mul__(self, other):
+                return "My mul"
+
+            def __rmul__(self, other):
+                return "My rmul"
+
+        me = MyClass()
+        assert me * a == "My mul"
+        assert a * me == "My rmul"
+
 #------------------------------------------------------------------------------
 
 class TestMaskedArrayInPlaceArithmetics(TestCase):