Merge branch 'matplotlib:main' into fixSpineBounds

leakyH · web-flow · commit 86b9928fa549 · 2025-07-20T02:53:17.000+08:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -743,12 +743,11 @@ def __setitem__(self, key, val):
                 and val is rcsetup._auto_backend_sentinel
                 and "backend" in self):
             return
+        valid_key = _api.check_getitem(
+            self.validate, rcParam=key, _error_cls=KeyError
+        )
         try:
-            cval = self.validate[key](val)
-        except KeyError as err:
-            raise KeyError(
-                f"{key} is not a valid rc parameter (see rcParams.keys() for "
-                f"a list of valid parameters)") from err
+            cval = valid_key(val)
         except ValueError as ve:
             raise ValueError(f"Key {key}: {ve}") from None
         self._set(key, cval)
diff --git a/lib/matplotlib/_api/__init__.py b/lib/matplotlib/_api/__init__.py
@@ -10,6 +10,7 @@
 
 """
 
+import difflib
 import functools
 import itertools
 import pathlib
@@ -174,12 +175,17 @@ def check_shape(shape, /, **kwargs):
             )
 
 
-def check_getitem(mapping, /, **kwargs):
+def check_getitem(mapping, /, _error_cls=ValueError, **kwargs):
     """
     *kwargs* must consist of a single *key, value* pair.  If *key* is in
     *mapping*, return ``mapping[value]``; else, raise an appropriate
     ValueError.
 
+    Parameters
+    ----------
+    _error_cls :
+        Class of error to raise.
+
     Examples
     --------
     >>> _api.check_getitem({"foo": "bar"}, arg=arg)
@@ -190,9 +196,14 @@ def check_getitem(mapping, /, **kwargs):
     try:
         return mapping[v]
     except KeyError:
-        raise ValueError(
-            f"{v!r} is not a valid value for {k}; supported values are "
-            f"{', '.join(map(repr, mapping))}") from None
+        if len(mapping) > 5:
+            if len(best := difflib.get_close_matches(v, mapping.keys(), cutoff=0.5)):
+                suggestion = f"Did you mean one of {best}?"
+            else:
+                suggestion = ""
+        else:
+            suggestion = f"Supported values are {', '.join(map(repr, mapping))}"
+        raise _error_cls(f"{v!r} is not a valid value for {k}. {suggestion}") from None
 
 
 def caching_module_getattr(cls):
diff --git a/lib/matplotlib/_api/__init__.pyi b/lib/matplotlib/_api/__init__.pyi
@@ -42,7 +42,9 @@ def check_in_list(
     values: Sequence[Any], /, *, _print_supported_values: bool = ..., **kwargs: Any
 ) -> None: ...
 def check_shape(shape: tuple[int | None, ...], /, **kwargs: NDArray) -> None: ...
-def check_getitem(mapping: Mapping[Any, Any], /, **kwargs: Any) -> Any: ...
+def check_getitem(
+        mapping: Mapping[Any, _T], /, _error_cls: type[Exception], **kwargs: Any
+) -> _T: ...
 def caching_module_getattr(cls: type) -> Callable[[str], Any]: ...
 @overload
 def define_aliases(
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -92,10 +92,8 @@ def __init__(self, cmaps):
         self._builtin_cmaps = tuple(cmaps)
 
     def __getitem__(self, item):
-        try:
-            return self._cmaps[item].copy()
-        except KeyError:
-            raise KeyError(f"{item!r} is not a known colormap name") from None
+        cmap = _api.check_getitem(self._cmaps, colormap=item, _error_cls=KeyError)
+        return cmap.copy()
 
     def __iter__(self):
         return iter(self._cmaps)
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -459,7 +459,8 @@ def set_linewidth(self, w):
         w : float or None
         """
         w = mpl._val_or_rc(w, 'patch.linewidth')
-        self._linewidth = float(w)
+        w = float(w)
+        self._linewidth = w
         self._dash_pattern = mlines._scale_dashes(*self._unscaled_dash_pattern, w)
         self.stale = True
 
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -1876,3 +1876,13 @@ def scaled(self):
     axes[0,1].pcolor(r, colorizer=colorizer)
     axes[1,0].contour(r, colorizer=colorizer)
     axes[1,1].contourf(r, colorizer=colorizer)
+
+
+def test_close_error_name():
+    with pytest.raises(
+        KeyError,
+        match=(
+            "'grays' is not a valid value for colormap. "
+            "Did you mean one of ['gray', 'Grays', 'gray_r']?"
+        )):
+        matplotlib.colormaps["grays"]
diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py
@@ -150,7 +150,9 @@ def test_context_with_badparam():
     with style.context({PARAM: other_value}):
         assert mpl.rcParams[PARAM] == other_value
         x = style.context({PARAM: original_value, 'badparam': None})
-        with pytest.raises(KeyError):
+        with pytest.raises(
+            KeyError, match="\'badparam\' is not a valid value for rcParam. "
+        ):
             with x:
                 pass
         assert mpl.rcParams[PARAM] == other_value
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -3,7 +3,7 @@
 import operator
 from unittest import mock
 
-from matplotlib.backend_bases import MouseEvent
+from matplotlib.backend_bases import MouseEvent, DrawEvent
 import matplotlib.colors as mcolors
 import matplotlib.widgets as widgets
 import matplotlib.pyplot as plt
@@ -1757,3 +1757,26 @@ def test_MultiCursor(horizOn, vertOn):
         assert l.get_xdata() == (.5, .5)
     for l in multi.hlines:
         assert l.get_ydata() == (.25, .25)
+
+
+def test_parent_axes_removal():
+
+    fig, (ax_radio, ax_checks) = plt.subplots(1, 2)
+
+    radio = widgets.RadioButtons(ax_radio, ['1', '2'], 0)
+    checks = widgets.CheckButtons(ax_checks, ['1', '2'], [True, False])
+
+    ax_checks.remove()
+    ax_radio.remove()
+    with io.BytesIO() as out:
+        # verify that saving does not raise
+        fig.savefig(out, format='raw')
+
+    # verify that this method which is triggered by a draw_event callback when
+    # blitting is enabled does not raise.  Calling private methods is simpler
+    # than trying to force blitting to be enabled with Agg or use a GUI
+    # framework.
+    renderer = fig._get_renderer()
+    evt = DrawEvent('draw_event', fig.canvas, renderer)
+    radio._clear(evt)
+    checks._clear(evt)
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -117,7 +117,9 @@ def __init__(self, ax):
         self.ax = ax
         self._cids = []
 
-    canvas = property(lambda self: self.ax.get_figure(root=True).canvas)
+    canvas = property(
+        lambda self: getattr(self.ax.get_figure(root=True), 'canvas', None)
+    )
 
     def connect_event(self, event, callback):
         """
@@ -144,6 +146,10 @@ def _get_data_coords(self, event):
         return ((event.xdata, event.ydata) if event.inaxes is self.ax
                 else self.ax.transData.inverted().transform((event.x, event.y)))
 
+    def ignore(self, event):
+        # docstring inherited
+        return super().ignore(event) or self.canvas is None
+
 
 class Button(AxesWidget):
     """
@@ -2181,7 +2187,9 @@ def connect_default_events(self):
 
     def ignore(self, event):
         # docstring inherited
-        if not self.active or not self.ax.get_visible():
+        if super().ignore(event):
+            return True
+        if not self.ax.get_visible():
             return True
         # If canvas was locked
         if not self.canvas.widgetlock.available(self):
