Fix merge

mdboom · mdboom · commit 2db3419b57e4 · 2015-12-14T12:07:52.000-05:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -285,8 +285,7 @@ def _get_nth_color(cls, val):
             clist = rcParams['axes.color_cycle']
             prop_cycler = cycler('color', clist)
 
-        cycler = cls._get_property_cycler()
-        colors = cycler.by_key()['color']
+        colors = prop_cycler.by_key()['color']
         return colors[val % len(colors)]
 
     @classmethod
