Merge pull request #6275 from WeatherGod/fix_cycler_validation

tacaswell · tacaswell · commit 337fb073760c · 2016-04-11T20:30:36.000-04:00
Fix cycler validation
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -726,15 +726,7 @@ def cycler(*args, **kwargs):
         if not isinstance(args[0], Cycler):
             raise TypeError("If only one positional argument given, it must "
                             " be a Cycler instance.")
-
-        c = args[0]
-        unknowns = c.keys - (set(_prop_validators.keys()) |
-                             set(_prop_aliases.keys()))
-        if unknowns:
-            # This is about as much validation I can do
-            raise TypeError("Unknown artist properties: %s" % unknowns)
-        else:
-            return Cycler(c)
+        return validate_cycler(args[0])
     elif len(args) == 2:
         pairs = [(args[0], args[1])]
     elif len(args) > 2:
@@ -789,6 +781,33 @@ def validate_cycler(s):
     else:
         raise ValueError("object was not a string or Cycler instance: %s" % s)
 
+    unknowns = cycler_inst.keys - (set(_prop_validators) | set(_prop_aliases))
+    if unknowns:
+        raise ValueError("Unknown artist properties: %s" % unknowns)
+
+    # Not a full validation, but it'll at least normalize property names
+    # A fuller validation would require v0.10 of cycler.
+    checker = set()
+    for prop in cycler_inst.keys:
+        norm_prop = _prop_aliases.get(prop, prop)
+        if norm_prop != prop and norm_prop in cycler_inst.keys:
+            raise ValueError("Cannot specify both '{0}' and alias '{1}'"
+                             " in the same prop_cycle".format(norm_prop, prop))
+        if norm_prop in checker:
+            raise ValueError("Another property was already aliased to '{0}'."
+                             " Collision normalizing '{1}'.".format(norm_prop,
+                                                                    prop))
+        checker.update([norm_prop])
+
+    # This is just an extra-careful check, just in case there is some
+    # edge-case I haven't thought of.
+    assert len(checker) == len(cycler_inst.keys)
+
+    # Now, it should be safe to mutate this cycler
+    for prop in cycler_inst.keys:
+        norm_prop = _prop_aliases.get(prop, prop)
+        cycler_inst.change_key(prop, norm_prop)
+
     return cycler_inst
 
 
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -31,7 +31,7 @@ def test_colorcycle_basic():
 def test_marker_cycle():
     fig = plt.figure()
     ax = fig.add_subplot(111)
-    ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']) +
+    ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) +
                       cycler('marker', ['.', '*', 'x']))
     xs = np.arange(10)
     ys = 0.25 * xs + 2
@@ -47,7 +47,7 @@ def test_marker_cycle():
     fig = plt.figure()
     ax = fig.add_subplot(111)
     # Test keyword arguments, numpy arrays, and generic iterators
-    ax.set_prop_cycle(color=np.array(['r', 'g', 'y']),
+    ax.set_prop_cycle(c=np.array(['r', 'g', 'y']),
                       marker=iter(['.', '*', 'x']))
     xs = np.arange(10)
     ys = 0.25 * xs + 2
@@ -66,7 +66,7 @@ def test_marker_cycle():
 def test_linestylecycle_basic():
     fig = plt.figure()
     ax = fig.add_subplot(111)
-    ax.set_prop_cycle(cycler('linestyle', ['-', '--', ':']))
+    ax.set_prop_cycle(cycler('ls', ['-', '--', ':']))
     xs = np.arange(10)
     ys = 0.25 * xs + 2
     ax.plot(xs, ys, label='solid', lw=4)
@@ -84,7 +84,7 @@ def test_linestylecycle_basic():
 def test_fillcycle_basic():
     fig = plt.figure()
     ax = fig.add_subplot(111)
-    ax.set_prop_cycle(cycler('color',  ['r', 'g', 'y']) +
+    ax.set_prop_cycle(cycler('c',  ['r', 'g', 'y']) +
                       cycler('hatch', ['xx', 'O', '|-']) +
                       cycler('linestyle', ['-', '--', ':']))
     xs = np.arange(10)
@@ -130,7 +130,7 @@ def test_valid_input_forms():
     ax.set_prop_cycle(None)
     ax.set_prop_cycle(cycler('linewidth', [1, 2]))
     ax.set_prop_cycle('color', 'rgywkbcm')
-    ax.set_prop_cycle('linewidth', (1, 2))
+    ax.set_prop_cycle('lw', (1, 2))
     ax.set_prop_cycle('linewidth', [1, 2])
     ax.set_prop_cycle('linewidth', iter([1, 2]))
     ax.set_prop_cycle('linewidth', np.array([1, 2]))
@@ -179,6 +179,13 @@ def test_invalid_input_forms():
             'linewidth', {'1': 1, '2': 2})
     assert_raises((TypeError, ValueError), ax.set_prop_cycle,
             linewidth=1, color='r')
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle, 'foobar', [1, 2])
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle,
+            foobar=[1, 2])
+    assert_raises((TypeError, ValueError), ax.set_prop_cycle,
+            cycler(foobar=[1, 2]))
+    assert_raises(ValueError, ax.set_prop_cycle,
+            cycler(color='rgb', c='cmy'))
 
 
 if __name__ == '__main__':
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -322,6 +322,10 @@ def test_validators():
                      ("cycler('c', 'rgb') * cycler('linestyle', ['-', '--'])",
                       (cycler('color', 'rgb') *
                           cycler('linestyle', ['-', '--']))),
+                     (cycler('ls', ['-', '--']),
+                      cycler('linestyle', ['-', '--'])),
+                     (cycler(mew=[2, 5]),
+                      cycler('markeredgewidth', [2, 5])),
                     ),
          # This is *so* incredibly important: validate_cycler() eval's
          # an arbitrary string! I think I have it locked down enough,
@@ -343,6 +347,7 @@ def test_validators():
                   ('cycler("waka", [1, 2, 3])', ValueError),  # not a property
                   ('cycler(c=[1, 2, 3])', ValueError),  # invalid values
                   ("cycler(lw=['a', 'b', 'c'])", ValueError),  # invalid values
+                  (cycler('waka', [1, 3, 5]), ValueError),  # not a property
                  )
         },
         {'validator': validate_hatch,
diff --git a/setupext.py b/setupext.py
@@ -1323,7 +1323,7 @@ def check(self):
         return "using cycler version %s" % cycler.__version__
 
     def get_install_requires(self):
-        return ['cycler']
+        return ['cycler>=0.9']
 
 
 class Dateutil(SetupPackage):
