FIX: catch warnings from pandas in cbook._check_1d

tacaswell · tacaswell · commit ae4354cf89db · 2020-01-27T14:40:08.000-05:00
If we catch the warning or the exception, we need to cast to numpy because later on in `_plot_args` we again use multi-dimensional indexing to up-cast to a 2D array. closes #16295
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1367,11 +1367,22 @@ def _check_1d(x):
         return np.atleast_1d(x)
     else:
         try:
-            ndim = x[:, None].ndim
             # work around https://github.com/pandas-dev/pandas/issues/27775
             # which mean the shape is not as expected. That this ever worked
             # was an unintentional quirk of pandas the above line will raise
             # an exception in the future.
+            # This warns in pandas >= 1.0 via
+            # https://github.com/pandas-dev/pandas/pull/30588
+            with warnings.catch_warnings() as w:
+                warnings.filterwarnings("ignore",
+                                        category=DeprecationWarning,
+                                        module='pandas[.*]')
+
+                ndim = x[:, None].ndim
+                # we have definitely hit a pandas index or series object
+                # cast to a numpy array.
+                if len(w) != 0:
+                    return np.asanyarray(x)
             if ndim < 2:
                 return np.atleast_1d(x)
             return x
