Changed: Cleaned up style to conform, simplified boolexpr, and added back validator with allow_none to default dashes

kenmaca · kenmaca · commit 8d33b9bf4fb9 · 2017-03-04T20:01:00.000-05:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -295,7 +295,8 @@ def validate_maskedarray(v):
 
 class validate_nseq_float(object):
     def __init__(self, n=None, allow_none=False):
-        self.n, self.allow_none = n, allow_none
+        self.n = n
+        self.allow_none = allow_none
 
     def __call__(self, s):
         """return a seq of n floats or raise"""
@@ -310,8 +311,7 @@ def __call__(self, s):
 
         try:
             return [float(val)
-                    if self.allow_none and val is not None
-                    or not self.allow_none
+                    if not self.allow_none or val is not None
                     else val
                     for val in s]
         except ValueError:
@@ -933,6 +933,7 @@ def _validate_linestyle(ls):
     raise ValueError("linestyle must be a string or " +
                      "an even-length sequence of floats.")
 
+
 # a map from key -> value, converter
 defaultParams = {
     'backend':           ['Agg', validate_backend],  # agg is certainly
@@ -966,10 +967,10 @@ def _validate_linestyle(ls):
     'lines.solid_joinstyle': ['round', validate_joinstyle],
     'lines.dash_capstyle':   ['butt', validate_capstyle],
     'lines.solid_capstyle':  ['projecting', validate_capstyle],
-    'lines.dashed_pattern':  [[3.7, 1.6], validate_nseq_float()],
+    'lines.dashed_pattern':  [[3.7, 1.6], validate_nseq_float(allow_none=True)],
     'lines.dashdot_pattern': [[6.4, 1.6, 1, 1.6],
-                              validate_nseq_float()],
-    'lines.dotted_pattern':  [[1, 1.65], validate_nseq_float()],
+                              validate_nseq_float(allow_none=True)],
+    'lines.dotted_pattern':  [[1, 1.65], validate_nseq_float(allow_none=True)],
     'lines.scale_dashes':  [True, validate_bool],
 
     # marker props
