Added markevery validator to rcparams with basic rcparams test

salindersidhu · salindersidhu · commit 3bee9363d002 · 2018-03-07T21:36:26.000-05:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -534,7 +534,36 @@ def validate_ps_distiller(s):
 _validate_negative_linestyle = ValidateInStrings('negative_linestyle',
                                                  ['solid', 'dashed'],
                                                  ignorecase=True)
+def validate_markevery(s):
+    """
+    Validate the markevery property of a Line2D object.
+
+    Parameters
+    ----------
+    s : None, int, float, slice, length-2 tuple of ints,
+        length-2 tuple of floats, list
+
+    Returns
+    -------
+    s : None, int, float, slice, length-2 tuple of ints,
+        length-2 tuple of floats, list, ValueError
+
+    """
+
+    if isinstance(s, tuple):
+        # Ensure correct length of 2
+        if len(s) != 2:
+            raise ValueError("'markevery' tuple must be a length of 2")
+        # Ensure that all elements in the tuple are of type int
+        if not all(isinstance(x, int) for x in s):
+            raise ValueError("'markevery' tuple ")
+        # Ensure that all elements in the tuple are of type float
+        elif not all(isinstance(x, float) for x in s):
+            raise ValueError("'markevery' tuple ")
+
+    return s;
 
+validate_markeverylist = _listify_validator(validate_markevery)
 
 validate_legend_loc = ValidateInStrings(
     'legend_loc',
@@ -676,6 +705,7 @@ def validate_hatch(s):
         'markersize': validate_floatlist,
         'markeredgewidth': validate_floatlist,
         'markeredgecolor': validate_colorlist,
+        'markevery': validate_markeverylist,
         'alpha': validate_floatlist,
         'marker': validate_stringlist,
         'hatch': validate_hatchlist,
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -23,6 +23,7 @@
                                 validate_cycler,
                                 validate_hatch,
                                 validate_hist_bins,
+                                validate_markevery,
                                 _validate_linestyle)
 
 
@@ -326,6 +327,17 @@ def generate_validator_testcases(valid):
                      ),
          'fail': (('aardvark', ValueError),
                   )
+         },
+         {'validator': validate_markevery,
+          'success': ((None,None),
+                      (1,1),
+                      (0.1,0.1)
+                      ),
+          'fail': (((1,2,3), ValueError),
+                   ((0.1,0.2,0.3), ValueError),
+                   ((1,0.1), ValueError),
+                   (('abc'), ValueError)
+                   )
          }
     )
 
