Fix some typos and handle some other codes using color cycling

WeatherGod · WeatherGod · commit 0c1e609e7e10 · 2015-08-15T14:45:48.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2936,7 +2936,7 @@ def xywhere(xs, ys, mask):
 
         if ecolor is None:
             if l0 is None and 'color' in self._get_lines._prop_keys:
-                ecolor = six.next(self._get_lines.prop_cycle)['color']
+                ecolor = six.next(self._get_lines.prop_cycler)['color']
             else:
                 ecolor = l0.get_color()
 
@@ -5830,7 +5830,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
         nx = len(x)  # number of datasets
 
         if color is None and 'color' in self._get_lines._prop_keys:
-            color = [six.next(self._get_lines.prop_cycle)['color']
+            color = [six.next(self._get_lines.prop_cycler)['color']
                      for i in xrange(nx)]
         else:
             color = mcolors.colorConverter.to_rgba_array(color)
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -24,6 +24,7 @@
 import warnings
 import types
 
+from cycler import cycler
 import matplotlib
 import matplotlib.colorbar
 from matplotlib import style
@@ -394,7 +395,7 @@ def xkcd(scale=1, length=100, randomness=2):
         rcParams['grid.linewidth'] = 0.0
         rcParams['axes.grid'] = False
         rcParams['axes.unicode_minus'] = False
-        rcParams['axes.color_cycle'] = ['b', 'r', 'c', 'm']
+        rcParams['axes.prop_cycle'] = cycler('color', ['b', 'r', 'c', 'm'])
         rcParams['axes.edgecolor'] = 'black'
         rcParams['xtick.major.size'] = 8
         rcParams['xtick.major.width'] = 3
diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py
@@ -103,13 +103,13 @@ def stackplot(axes, x, *args, **kwargs):
 
     # Color between x = 0 and the first array.
     r.append(axes.fill_between(x, first_line, stack[0, :],
-                               facecolor=six.next(axes._get_lines.color_cycle),
+                               facecolor=six.next(axes._get_lines.prop_cycler)['color'],
                                label= six.next(labels, None),
                                **kwargs))
 
     # Color between array i-1 and array i
     for i in xrange(len(y) - 1):
-        color = six.next(axes._get_lines.color_cycle)
+        color = six.next(axes._get_lines.prop_cycler)['color']
         r.append(axes.fill_between(x, stack[i, :], stack[i + 1, :],
                                    facecolor= color,
                                    label= six.next(labels, None),
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -83,7 +83,7 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,
         transform = axes.transData
 
     if color is None:
-        color = six.next(axes._get_lines.color_cycle)
+        color = six.next(axes._get_lines.prop_cycler)['color']
 
     if linewidth is None:
         linewidth = matplotlib.rcParams['lines.linewidth']
