Merge pull request #26452 from mtsokol/update-np-exceptions-imports

timhoffm · web-flow · commit 7f95a2672d1f · 2023-08-04T16:14:35.000+02:00
ENH: Update numpy exceptions imports
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -23,6 +23,11 @@
 
 import numpy as np
 
+try:
+    from numpy.exceptions import VisibleDeprecationWarning  # numpy >= 1.25
+except ImportError:
+    from numpy import VisibleDeprecationWarning
+
 import matplotlib
 from matplotlib import _api, _c_internal_utils
 
@@ -1064,7 +1069,7 @@ def _combine_masks(*args):
                 raise ValueError("Masked arrays must be 1-D")
             try:
                 x = np.asanyarray(x)
-            except (np.VisibleDeprecationWarning, ValueError):
+            except (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)
@@ -1658,7 +1663,7 @@ def index_of(y):
         pass
     try:
         y = _check_1d(y)
-    except (np.VisibleDeprecationWarning, ValueError):
+    except (VisibleDeprecationWarning, ValueError):
         # NumPy 1.19 will warn on ragged input, and we can't actually use it.
         pass
     else:
