Updated the fill test to get the hatching.

WeatherGod · WeatherGod · commit b0bb268f6a0c · 2015-07-28T13:37:42.000-04:00
Explicitly deprecated axes.color_cycle
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -116,6 +116,8 @@
 import contextlib
 import distutils.sysconfig
 
+from cycler import cycler
+
 # cbook must import matplotlib only within function
 # definitions, so it is safe to import from it here.
 from matplotlib.cbook import is_string_like, mplDeprecation
@@ -826,6 +828,8 @@ def matplotlib_fname():
     'svg.embed_char_paths': ('svg.fonttype',
                              lambda x: "path" if x else "none", None),
     'savefig.extension': ('savefig.format', lambda x: x, None),
+    'axes.color_cycle': ('axes.prop_cycle', lambda x: cycler('color', x),
+                         lambda x: [c.get('color', None) for c in x),
     }
 
 _deprecated_ignore_map = {
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -156,8 +156,8 @@ def set_prop_cycle(self, prop_cycler=None):
                 clist = rcParams['axes.color_cycle']
                 prop_cycler = cycler('color', clist)
         self.prop_cycler = itertools.cycle(prop_cycler)
-        # Make a copy
-        self._prop_keys = list(prop_cycler.keys)
+        # This should make a copy
+        self._prop_keys = prop_cycler.keys
 
     def __call__(self, *args, **kwargs):
 
diff --git a/lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_basic.png b/lib/matplotlib/tests/baseline_images/test_cycles/fill_cycle_basic.png
diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py
@@ -44,17 +44,17 @@ def test_linestylecycle_basic():
 def test_fillcycle_basic():
     fig = plt.figure()
     ax = fig.add_subplot(111)
-    ax.set_prop_cycle(cycler('color',  ['red', 'green', 'yellow']))# +
-                      #cycler('hatch', ['xx', 'O', '|-']))
+    ax.set_prop_cycle(cycler('color',  ['r', 'g', 'y']) +
+                      cycler('hatch', ['xx', 'O', '|-']))
     xs = np.arange(10)
     ys = 0.25 * xs**.5 + 2
-    ax.fill(xs, ys, label='red, x')
+    ax.fill(xs, ys, label='red, x', facecolor='none')
     ys = 0.45 * xs**.5 + 3
-    ax.fill(xs, ys, label='green, circle')
+    ax.fill(xs, ys, label='green, circle', facecolor='none')
     ys = 0.65 * xs**.5 + 4
-    ax.fill(xs, ys, label='yellow, cross')
+    ax.fill(xs, ys, label='yellow, cross', facecolor='none')
     ys = 0.85 * xs**.5 + 5
-    ax.fill(xs, ys, label='red2, x2')
+    ax.fill(xs, ys, label='red2, x2', facecolor='none')
     ax.legend(loc='upper left')
 
 
