Realized that I didn't have a hatch validator

WeatherGod · WeatherGod · commit 63d632113c4a · 2015-08-24T11:25:17.000-04:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -65,16 +65,19 @@ def __call__(self, s):
                          % (self.key, s, list(six.itervalues(self.valid))))
 
 
-def _listify_validator(scalar_validator):
+def _listify_validator(scalar_validator, allow_stringlist=False):
     def f(s):
         if isinstance(s, six.string_types):
             try:
                 return [scalar_validator(v.strip()) for v in s.split(',')
                         if v.strip()]
             except Exception:
-                # Sometimes, a list of colors might be a single string
-                # of single-letter colornames. So give that a shot.
-                return [scalar_validator(v.strip()) for v in s if v.strip()]
+                if allow_stringlist:
+                    # Sometimes, a list of colors might be a single string
+                    # of single-letter colornames. So give that a shot.
+                    return [scalar_validator(v.strip()) for v in s if v.strip()]
+                else:
+                    raise
         elif type(s) in (list, tuple):
             return [scalar_validator(v) for v in s if v]
         else:
@@ -331,7 +334,7 @@ def deprecate_axes_colorcycle(value):
     return validate_colorlist(value)
 
 
-validate_colorlist = _listify_validator(validate_color)
+validate_colorlist = _listify_validator(validate_color, allow_stringlist=True)
 validate_colorlist.__doc__ = 'return a list of colorspecs'
 
 validate_stringlist = _listify_validator(six.text_type)
@@ -583,6 +586,24 @@ def __call__(self, s):
 validate_grid_axis = ValidateInStrings('axes.grid.axis', ['x', 'y', 'both'])
 
 
+def validate_hatch(s):
+    """
+    Validate a hatch pattern.
+    A hatch pattern string can have any sequence of the following
+    characters: ``\\ / | - + * . x o O``.
+
+    """
+    if not isinstance(s, six.text_type):
+        raise ValueError("Hatch pattern must be a string")
+    unique_chars = set(s)
+    unknown = (unique_chars -
+                set(['\\', '/', '|', '-', '+', '*', '.', 'x', 'o', 'O']))
+    if unknown:
+        raise ValueError("Unknown hatch symbol(s): %s" % list(unknown))
+    return s
+validate_hatchlist = _listify_validator(validate_hatch)
+
+
 _prop_validators = {
         'color': validate_colorlist,
         'linewidth': validate_floatlist,
@@ -598,6 +619,7 @@ def __call__(self, s):
         'markeredgecolor': validate_colorlist,
         'alpha': validate_floatlist,
         'marker': validate_stringlist,
+        'hatch': validate_hatchlist,
     }
 _prop_aliases = {
         'c': 'color',
@@ -611,6 +633,7 @@ def __call__(self, s):
         'ms': 'markersize',
     }
 
+
 def cycler(*args, **kwargs):
     """
     Creates a :class:`cycler.Cycler` object much like :func:`cycler.cycler`,
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -25,7 +25,8 @@
                                 validate_bool,
                                 validate_nseq_int,
                                 validate_nseq_float,
-                                validate_cycler)
+                                validate_cycler,
+                                validate_hatch)
 
 
 mpl.rc('text', usetex=False)
@@ -335,6 +336,13 @@ def test_validators():
                   ("cycler(lw=['a', 'b', 'c'])", ValueError),  # invalid values
                  )
         },
+        {'validator': validate_hatch,
+         'success': (('--|', '--|'), ('\\oO', '\\oO'),
+                     ('/+*/.x', '/+*/.x'), ('', '')),
+         'fail': (('--_', ValueError),
+                  (8, ValueError),
+                  ('X', ValueError)),
+        },
     )
 
     for validator_dict in validation_tests:
