Merge pull request #7660 from ahaldane/fix_7493_1.11

charris · charris · commit 693bead140fc · 2016-05-23T11:13:53.000-06:00
Backport 7659, BUG: Temporary fix for str(mvoid) for object field types
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
@@ -5954,7 +5954,14 @@ def __str__(self):
             return self._data.__str__()
         printopt = masked_print_option
         rdtype = _recursive_make_descr(self._data.dtype, "O")
-        res = np.array([self._data]).astype(rdtype)
+
+        # temporary hack to fix gh-7493. A more permanent fix
+        # is proposed in gh-6053, after which the next two
+        # lines should be changed to
+        # res = np.array([self._data], dtype=rdtype)
+        res = np.empty(1, rdtype)
+        res[:1] = self._data
+
         _recursive_printoption(res, self._mask, printopt)
         return str(res[0])
 
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
@@ -757,6 +757,10 @@ def test_mvoid_print(self):
         finally:
             masked_print_option.set_display(ini_display)
 
+        # also check if there are object datatypes (see gh-7493)
+        mx = array([(1,), (2,)], dtype=[('a', 'O')])
+        assert_equal(str(mx[0]), "(1,)")
+
     def test_mvoid_multidim_print(self):
 
         # regression test for gh-6019
