Simplify try...except and add additional comment

l-johnston · l-johnston · commit 6365ae569251 · 2020-08-04T13:52:33.000-05:00
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -1323,11 +1323,8 @@ def _check_1d(x):
                     "always",
                     category=Warning,
                     message='Support for multi-dimensional indexing')
-                try:
-                    ndim = x[:, None].ndim
-                except AssertionError:
-                    # catch https://github.com/pandas-dev/pandas/issues/35527
-                    return np.asanyarray(x)
+
+                ndim = x[:, None].ndim
                 # we have definitely hit a pandas index or series object
                 # cast to a numpy array.
                 if len(w) > 0:
@@ -1338,7 +1335,10 @@ def _check_1d(x):
             if ndim < 2:
                 return np.atleast_1d(x)
             return x
-        except (IndexError, TypeError):
+        # In pandas 1.1.0, multidimensional indexing leads to an AssertionError for some
+        # Series objects, but should be IndexError as described in
+        # https://github.com/pandas-dev/pandas/issues/35527
+        except (AssertionError, IndexError, TypeError):
             return np.atleast_1d(x)
 
 
