Allow object arrays in cbook._combine_masks.

QuLogic · QuLogic · commit a0aac5a0533a · 2020-05-21T23:08:12.000-04:00
This function accepts almost anything list-like, so we really do want
conversion to object arrays if the input is ragged. For example, this
might occur for `scatter()` if passed different types of `colors`, like
in the `test_scatter_marker` test.
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -989,7 +989,12 @@ def _combine_masks(*args):
         else:
             if isinstance(x, np.ma.MaskedArray) and x.ndim > 1:
                 raise ValueError("Masked arrays must be 1-D")
-            x = np.asanyarray(x)
+            try:
+                x = np.asanyarray(x)
+            except (np.VisibleDeprecationWarning, ValueError):
+                # NumPy 1.19 raises a warning about ragged arrays, but we want
+                # to accept basically anything here.
+                x = np.asanyarray(x, dtype=object)
             if x.ndim == 1:
                 x = safe_masked_invalid(x)
                 seqlist[i] = True
