MNT: remove implicit color from cycler axes._base

tacaswell · tacaswell · commit 701bfb0380d2 · 2016-05-29T18:36:07.000-04:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -167,10 +167,6 @@ def set_prop_cycle(self, *args, **kwargs):
         else:
             prop_cycler = cycler(*args, **kwargs)
 
-        # Make sure the cycler always has at least one color
-        if 'color' not in prop_cycler.keys:
-            prop_cycler = prop_cycler * cycler('color', ['k'])
-
         self.prop_cycler = itertools.cycle(prop_cycler)
         # This should make a copy
         self._prop_keys = prop_cycler.keys
@@ -200,6 +196,8 @@ def get_next_color(self):
         """
         Return the next color in the cycle.
         """
+        if 'color' not in self._prop_keys:
+            return 'k'
         return six.next(self.prop_cycler)['color']
 
     def set_lineprops(self, line, **kwargs):
