Merge pull request #7260 from gerritholl/fix-structured-masked-array-str

ahaldane · ahaldane · commit bec40c2b7912 · 2016-02-22T15:14:24.000-05:00
BUG/TST: Fix #7259, do not "force scalar" for already scalar str/bytes
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
@@ -3530,7 +3530,14 @@ def get_fill_value(self):
         """
         if self._fill_value is None:
             self._fill_value = _check_fill_value(None, self.dtype)
-        return self._fill_value[()]
+
+        # Temporary workaround to account for the fact that str and bytes
+        # scalars cannot be indexed with (), whereas all other numpy
+        # scalars can. See issues #7259 and #7267.
+        # The if-block can be removed after #7267 has been fixed.
+        if isinstance(self._fill_value, ndarray):
+            return self._fill_value[()]
+        return self._fill_value
 
     def set_fill_value(self, value=None):
         """
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
@@ -1819,6 +1819,13 @@ def test_fillvalue_in_view(self):
         y = x.view(dtype=np.int32)
         assert_(y.fill_value == 999999)
 
+    def test_fillvalue_bytes_or_str(self):
+        # Test whether fill values work as expected for structured dtypes
+        # containing bytes or str.  See issue #7259.
+        a = empty(shape=(3, ), dtype="(2)3S,(2)3U")
+        assert_equal(a["f0"].fill_value, default_fill_value(b"spam"))
+        assert_equal(a["f1"].fill_value, default_fill_value("eggs"))
+
 
 class TestUfuncs(TestCase):
     # Test class for the application of ufuncs on MaskedArrays.
