Reinstante _unpack_cycler

Author: h-vetinari

pandas/tests/plotting/common.py

@@ -493,6 +493,12 @@ def is_grid_on():
                 obj.plot(kind=kind, grid=True, **kws)
                 assert is_grid_on()
 
+    def _unpack_cycler(self, rcParams, field='color'):
+        """
+        Auxiliary function for correctly unpacking cycler after MPL >= 1.5
+        """
+        return [v[field] for v in rcParams['axes.prop_cycle']]
+
 
 def _check_plot_works(f, filterwarnings='always', **kwargs):
     import matplotlib.pyplot as plt

pandas/tests/plotting/test_frame.py

@@ -847,7 +847,7 @@ def test_area_lim(self):
     @pytest.mark.slow
     def test_bar_colors(self):
         import matplotlib.pyplot as plt
-        default_colors = [v['color'] for v in plt.rcParams['axes.prop_cycle']]
+        default_colors = self._unpack_cycler(plt.rcParams)
 
         df = DataFrame(randn(5, 5))
         ax = df.plot.bar()
@@ -1218,8 +1218,7 @@ def test_scatter_colors(self):
         with pytest.raises(TypeError):
             df.plot.scatter(x='a', y='b', c='c', color='green')
 
-        default_colors = [v['color']
-                          for v in self.plt.rcParams['axes.prop_cycle']]
+        default_colors = self._unpack_cycler(self.plt.rcParams)
 
         ax = df.plot.scatter(x='a', y='b', c='c')
         tm.assert_numpy_array_equal(
@@ -1883,8 +1882,7 @@ def test_dont_modify_colors(self):
     def test_line_colors_and_styles_subplots(self):
         # GH 9894
         from matplotlib import cm
-        default_colors = [v['color']
-                          for v in self.plt.rcParams['axes.prop_cycle']]
+        default_colors = self._unpack_cycler(self.plt.rcParams)
 
         df = DataFrame(randn(5, 5))
 
@@ -2004,8 +2002,7 @@ def test_area_colors(self):
 
     @pytest.mark.slow
     def test_hist_colors(self):
-        default_colors = [v['color']
-                          for v in self.plt.rcParams['axes.prop_cycle']]
+        default_colors = self._unpack_cycler(self.plt.rcParams)
 
         df = DataFrame(randn(5, 5))
         ax = df.plot.hist()
@@ -2066,8 +2063,7 @@ def test_kde_colors_and_styles_subplots(self):
         _skip_if_no_scipy_gaussian_kde()
 
         from matplotlib import cm
-        default_colors = [v['color']
-                          for v in self.plt.rcParams['axes.prop_cycle']]
+        default_colors = self._unpack_cycler(self.plt.rcParams)
 
         df = DataFrame(randn(5, 5))
 
@@ -2138,8 +2134,7 @@ def _check_colors(bp, box_c, whiskers_c, medians_c, caps_c='k',
             self._check_colors(bp['caps'],
                                linecolors=[caps_c] * len(bp['caps']))
 
-        default_colors = [v['color']
-                          for v in self.plt.rcParams['axes.prop_cycle']]
+        default_colors = self._unpack_cycler(self.plt.rcParams)
 
         df = DataFrame(randn(5, 5))
         bp = df.plot.box(return_type='dict')
@@ -2195,7 +2190,7 @@ def test_default_color_cycle(self):
         df = DataFrame(randn(5, 3))
         ax = df.plot()
 
-        expected = [v['color'] for v in plt.rcParams['axes.prop_cycle']][:3]
+        expected = self._unpack_cycler(plt.rcParams)[:3]
         self._check_colors(ax.get_lines(), linecolors=expected)
 
     def test_unordered_ts(self):

pandas/tests/plotting/test_series.py

@@ -849,7 +849,7 @@ def test_time_series_plot_color_kwargs(self):
     def test_time_series_plot_color_with_empty_kwargs(self):
         import matplotlib as mpl
 
-        def_colors = [v['color'] for v in mpl.rcParams['axes.prop_cycle']]
+        def_colors = self._unpack_cycler(mpl.rcParams)
         index = date_range('1/1/2000', periods=12)
         s = Series(np.arange(1, 13), index=index)