Merge pull request #16960 from anntzer/unquoted-rc

tacaswell · web-flow · commit bcc285235988 · 2020-03-30T14:53:15.000-04:00
MNT: Improve error for quoted values in matplotlibrc.
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -72,8 +72,14 @@ def __call__(self, s):
             s = s.lower()
         if s in self.valid:
             return self.valid[s]
-        raise ValueError('Unrecognized %s string %r: valid strings are %s'
-                         % (self.key, s, list(self.valid.values())))
+        msg = (f"{s!r} is not a valid value for {self.key}; supported values "
+               f"are {[*self.valid.values()]}")
+        if (isinstance(s, str)
+                and (s.startswith('"') and s.endswith('"')
+                     or s.startswith("'") and s.endswith("'"))
+                and s[1:-1] in self.valid):
+            msg += "; remove quotes surrounding your string"
+        raise ValueError(msg)
 
 
 def _listify_validator(scalar_validator, allow_stringlist=False, *, doc=None):
