BUG: change fix for gh-9328 to make masked.copy() a noop

eric-wieser · eric-wieser · commit 36f481ba4f16 · 2017-07-18T15:45:32.000+01:00
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
@@ -6253,6 +6253,12 @@ def __iop__(self, other):
         __iop__
     del __iop__  # don't leave this around
 
+    def copy(self, *args, **kwargs):
+        """ Copy is a no-op on the maskedconstant, as it is a scalar """
+        # maskedconstant is a scalar, so copy doesn't need to copy. There's
+        # precedent for this with `np.bool_` scalars.
+        return self
+
 
 masked = masked_singleton = MaskedConstant()
 masked_array = MaskedArray
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
@@ -4736,7 +4736,10 @@ def test_repr(self):
         # copies should not exist, but if they do, it should be obvious that
         # something is wrong
         assert_equal(repr(np.ma.masked), 'masked')
-        assert_not_equal(repr(np.ma.masked.copy()), 'masked')
+
+        # create a new instance in a weird way
+        masked2 = np.ma.MaskedArray.__new__(np.ma.core.MaskedConstant)
+        assert_not_equal(repr(masked2), 'masked')
 
     def test_pickle(self):
         from io import BytesIO
@@ -4748,30 +4751,12 @@ def test_pickle(self):
             res = pickle.load(f)
         assert_(res is np.ma.masked)
 
-    def test_write_to_copy(self):
+    def test_copy(self):
         # gh-9328
-        x = np.ma.masked.copy()
-        x[()] = 2
-
-        # write succeeds
-        assert_equal(x.data, 2)
-        assert_equal(x.mask, False)
-
-        # original should be unchanged
-        assert_equal(np.ma.masked.data, 0)
-        assert_equal(np.ma.masked.mask, True)
-
-    def test_no_copies(self):
-        # when making a view or a copy, downcast to MaskedArray
-        MC = np.ma.core.MaskedConstant
-
-        m_sl = np.ma.masked[...]
-        assert_equal(type(m_sl), np.ma.MaskedArray)
-        assert_equal(m_sl.mask, True)
-
-        m_copy = np.ma.masked.copy()
-        assert_equal(type(m_copy), np.ma.MaskedArray)
-        # assert_equal(m_copy.mask, True)  - gh-9430
+        # copy is a no-op, like it is with np.True_
+        assert_equal(
+            np.ma.masked.copy() is np.ma.masked,
+            np.True_.copy() is np.True_)
 
     def test_immutable(self):
         assert_raises(ValueError, operator.setitem, np.ma.masked.data, (), 1)
