Merge pull request #24601 from meeseeksmachine/auto-backport-of-pr-24600-on-v3.6.x

oscargus · web-flow · commit 1188b83ea93f · 2022-12-04T18:38:20.000+01:00
Backport PR #24600 on branch v3.6.x (Fix: Gracefully fail the string validator for tuple inputs)
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -68,7 +68,7 @@ def __call__(self, s):
             name, = (k for k, v in globals().items() if v is self)
             _api.warn_deprecated(
                 self._deprecated_since, name=name, obj_type="function")
-        if self.ignorecase:
+        if self.ignorecase and isinstance(s, str):
             s = s.lower()
         if s in self.valid:
             return self.valid[s]
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -1,6 +1,7 @@
 import copy
 import os
 from pathlib import Path
+import re
 import subprocess
 import sys
 from unittest import mock
@@ -591,3 +592,10 @@ def test_deprecation(monkeypatch):
     # Note that the warning suppression actually arises from the
     # iteration over the updater rcParams being protected by
     # suppress_matplotlib_deprecation_warning, rather than any explicit check.
+
+
+def test_rcparams_legend_loc():
+    value = (0.9, .7)
+    match_str = f"{value} is not a valid value for legend.loc;"
+    with pytest.raises(ValueError, match=re.escape(match_str)):
+        mpl.RcParams({'legend.loc': value})
