Resolved build errors

salindersidhu · salindersidhu · commit 3154b9019b49 · 2018-03-08T16:47:06.000-05:00
diff --git a/examples/lines_bars_and_markers/markevery_prop_cycle.py b/examples/lines_bars_and_markers/markevery_prop_cycle.py
@@ -11,12 +11,10 @@
 Renders a plot with shifted-sine curves along each column with
 a unique markevery value for each sine curve.
 """
-from __future__ import division
 from cycler import cycler
 import numpy as np
 import matplotlib as mpl
 import matplotlib.pyplot as plt
-import matplotlib.patches as mpatches
 
 # Define a list of markevery cases and color cases to plot
 cases = [None,
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -552,28 +552,28 @@ def validate_markevery(s):
     # Validate s against type slice
     if isinstance(s, slice):
         return s
-    # Validate s against type tuple and list
-    if isinstance(s, Iterable):
-        if isinstance(s, tuple):
-            tupMaxLength = 2
-            tupType = type(s[0])
-            if len(s) != tupMaxLength:
-                raise ValueError("'markevery' tuple must have a length "
-                                 "of %d" % (tupMaxLength))
-            if tupType is int and not all(isinstance(e, int) for e in s):
-                raise ValueError("'markevery' tuple with first element of "
-                                 "type int must have all elements of type "
-                                 "int")
-            if tupType is float and not all(isinstance(e, float) for e in s):
-                raise ValueError("'markevery' tuple with first element of "
-                                 "type float must have all elements of type "
-                                 "float")
-            if tupType is not float and tupType is not int:
-                raise TypeError("'markevery' tuple is of an invalid type")
-        if isinstance(s, list):
-            if not all(isinstance(e, int) for e in s):
-                raise ValueError("'markevery' list must have all elements "
-                                 "of type int")
+    # Validate s against type tuple
+    if isinstance(s, tuple):
+        tupMaxLength = 2
+        tupType = type(s[0])
+        if len(s) != tupMaxLength:
+            raise TypeError("'markevery' tuple must have a length of "
+                            "%d" % (tupMaxLength))
+        if tupType is int and not all(isinstance(e, int) for e in s):
+            raise TypeError("'markevery' tuple with first element of "
+                            "type int must have all elements of type "
+                            "int")
+        if tupType is float and not all(isinstance(e, float) for e in s):
+            raise TypeError("'markevery' tuple with first element of "
+                            "type float must have all elements of type "
+                            "float")
+        if tupType is not float and tupType is not int:
+            raise TypeError("'markevery' tuple contains an invalid type")
+    # Validate s against type list
+    elif isinstance(s, list):
+        if not all(isinstance(e, int) for e in s):
+            raise TypeError("'markevery' list must have all elements of "
+                            "type int")
     # Validate s against type float int and None
     elif not isinstance(s, (float, int)):
         if s is not None:
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -338,22 +338,23 @@ def generate_validator_testcases(valid):
                       (slice(2), slice(None, 2, None)),
                       (slice(1, 2, 3), slice(1, 2, 3))
                       ),
-          'fail': (((1, 2, 3), ValueError),
-                   ([1, 2, 0.3], ValueError),
-                   (['a', 2, 3], ValueError),
-                   ([1, 2, 'a'], ValueError),
-                   ((0.1, 0.2, 0.3), ValueError),
-                   ((0.1, 2, 3), ValueError),
-                   ((1, 0.2, 0.3), ValueError),
-                   ((1, 0.1), ValueError),
-                   ((0.1, 1), ValueError),
-                   (('abc'), ValueError),
-                   ((1, 'a'), ValueError),
-                   ((0.1, 'b'), ValueError),
-                   (('a', 1), ValueError),
-                   (('a', 0.1), ValueError),
+          'fail': (((1, 2, 3), TypeError),
+                   ([1, 2, 0.3], TypeError),
+                   (['a', 2, 3], TypeError),
+                   ([1, 2, 'a'], TypeError),
+                   ((0.1, 0.2, 0.3), TypeError),
+                   ((0.1, 2, 3), TypeError),
+                   ((1, 0.2, 0.3), TypeError),
+                   ((1, 0.1), TypeError),
+                   ((0.1, 1), TypeError),
+                   (('abc'), TypeError),
+                   ((1, 'a'), TypeError),
+                   ((0.1, 'b'), TypeError),
+                   (('a', 1), TypeError),
+                   (('a', 0.1), TypeError),
                    ('abc', TypeError),
-                   ('a', TypeError)
+                   ('a', TypeError),
+                   (object(), TypeError)
                    )
          }
     )
