Tweak wording of suggestion message from getitem_checked

QuLogic · QuLogic · commit 3799e6b16f91 · 2026-04-17T13:53:39.000-04:00
No need for 'one of' if there's only one option, add a colon to
match the syntax of Python's own suggestion message, and remove the
trailing space if there's no suggestion.
diff --git a/lib/matplotlib/_api/__init__.py b/lib/matplotlib/_api/__init__.py
@@ -211,13 +211,17 @@ def getitem_checked(mapping, /, _error_cls=ValueError, **kwargs):
         return mapping[v]
     except KeyError:
         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 = ""
+            best = difflib.get_close_matches(v, mapping.keys(), cutoff=0.5)
+            match len(best):
+                case 0:
+                    suggestion = ""
+                case 1:
+                    suggestion = f" Did you mean: {best[0]!r}?"
+                case _:
+                    suggestion = f" Did you mean one of: {', '.join(map(repr, best))}?"
         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
+            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/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -1882,9 +1882,8 @@ 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']?"
-        )):
+            r"'grays' is not a valid value for colormap\. "
+            r"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,9 +150,8 @@ 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, match="\'badparam\' is not a valid value for rcParam. "
-        ):
+        with pytest.raises(KeyError,
+                           match=r"'badparam' is not a valid value for rcParam\."):
             with x:
                 pass
         assert mpl.rcParams[PARAM] == other_value
