Add earlier color validation

griverat · griverat · commit cb25841bbb6f · 2020-07-11T15:48:12.000-05:00
diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py
@@ -2242,7 +2242,7 @@ def type_name(tp):
                     type_name(type(v))))
 
 
-def _check_in_list(_values, **kwargs):
+def _check_in_list(_values, _print_supported_values=True, **kwargs):
     """
     For each *key, value* pair in *kwargs*, check that *value* is in *_values*;
     if not, raise an appropriate ValueError.
@@ -2254,9 +2254,13 @@ def _check_in_list(_values, **kwargs):
     values = _values
     for k, v in kwargs.items():
         if v not in values:
-            raise ValueError(
-                "{!r} is not a valid value for {}; supported values are {}"
-                .format(v, k, ', '.join(map(repr, values))))
+            if _print_supported_values:
+                raise ValueError(
+                    "{!r} is not a valid value for {}; supported values are {}"
+                    .format(v, k, ', '.join(map(repr, values))))
+            else:
+                raise ValueError(
+                    "{!r} is not a valid value for {}".format(v, k))
 
 
 def _check_shape(_shape, **kwargs):
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -14,6 +14,7 @@
 from .artist import Artist, allow_rasterization
 from .cbook import (
     _to_unmasked_float_array, ls_mapper, ls_mapper_r, STEP_LOOKUP_MAP)
+from .colors import is_color_like, get_named_colors_mapping
 from .markers import MarkerStyle
 from .path import Path
 from .transforms import (
@@ -1039,6 +1040,9 @@ def set_color(self, color):
         ----------
         color : color
         """
+        if not is_color_like(color):
+            cbook._check_in_list(get_named_colors_mapping(),
+                                 _print_supported_values=False, color=color)
         self._color = color
         self.stale = True
 
