Merge branch 'matplotlib:main' into mplot3d-elev-azim-roll-doc

Author: MischaMegens2

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)

lib/matplotlib/__init__.pyi

@@ -40,6 +40,8 @@ from packaging.version import Version
 
 from matplotlib._api import MatplotlibDeprecationWarning
 from typing import Any, Literal, NamedTuple, overload
+from matplotlib.typing import LogLevel
+
 
 class _VersionInfo(NamedTuple):
     major: int
@@ -52,7 +54,7 @@ __bibtex__: str
 __version__: str
 __version_info__: _VersionInfo
 
-def set_loglevel(level: str) -> None: ...
+def set_loglevel(level: LogLevel) -> None: ...
 
 class _ExecInfo(NamedTuple):
     executable: str

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):

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(

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)

lib/matplotlib/pyplot.py

@@ -144,6 +144,7 @@
         MouseEventType,
         PickEventType,
         ResizeEventType,
+        LogLevel
     )
     from matplotlib.widgets import SubplotTool
 
@@ -351,7 +352,7 @@ def uninstall_repl_displayhook() -> None:
 
 # Ensure this appears in the pyplot docs.
 @_copy_docstring_and_deprecators(matplotlib.set_loglevel)
-def set_loglevel(level: str) -> None:
+def set_loglevel(level: LogLevel) -> None:
     return matplotlib.set_loglevel(level)
 
 

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"]

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

lib/matplotlib/typing.py

@@ -93,6 +93,9 @@
 CapStyleType: TypeAlias = CapStyle | Literal["butt", "projecting", "round"]
 """Line cap styles. See :doc:`/gallery/lines_bars_and_markers/capstyle`."""
 
+LogLevel: TypeAlias = Literal["notset", "debug", "info", "warning", "error", "critical"]
+"""Literal type for valid logging levels accepted by `set_loglevel()`."""
+
 CoordsBaseType = Union[
     str,
     Artist,