BUG/API : fix color validation

tacaswell · tacaswell · commit cff9efd7426f · 2015-03-13T21:53:46.000-04:00
Possible fix for #4192. This adds a new validation (validate_color_or_None) method for color which allows None and restores `validate_color` to fail on None. This will allow selected color rcparams to be `None` (not `'None'`) which the library should interpret as "don't use this rcparam".
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -235,6 +235,12 @@ def __call__(self, s):
             raise ValueError('Could not convert all entries to ints')
 
 
+def validate_color_or_None(s):
+    if s is None:
+        return None
+    return validate_color(s)
+
+
 def validate_color(s):
     'return a valid color arg'
     try:
@@ -245,6 +251,7 @@ def validate_color(s):
     if is_color_like(s):
         return s
     stmp = '#' + s
+
     if is_color_like(stmp):
         return stmp
     # If it is still valid, it must be a tuple.
@@ -595,7 +602,7 @@ def __call__(self, s):
     'image.lut':           [256, validate_int],  # lookup table
     'image.origin':        ['upper', six.text_type],  # lookup table
     'image.resample':      [False, validate_bool],
-    # Specify whether vector graphics backends will combine all images on a 
+    # Specify whether vector graphics backends will combine all images on a
     # set of axes into a single composite image
     'image.composite_image': [True, validate_bool],
 
@@ -685,6 +692,8 @@ def __call__(self, s):
     # the relative size of legend markers vs. original
     'legend.markerscale': [1.0, validate_float],
     'legend.shadow': [False, validate_bool],
+    'legend.facecolor': [None, validate_color_or_None],
+    'legend.edgecolor': [None, validate_color_or_None],
 
     ## tick properties
     'xtick.major.size':  [4, validate_float],    # major xtick size in points
