Merge pull request #4360 from nfoti/master

Fix issue #4345: graphics test failure

Author: cpcloud

doc/source/release.rst

@@ -74,6 +74,8 @@ pandas 0.13
     (:issue:`4102`, :issue:`4014`) in ``*.hist`` plotting methods
   - Fixed bug in ``PeriodIndex.map`` where using ``str`` would return the str
     representation of the index (:issue:`4136`)
+  - Fixed test failure ``test_time_series_plot_color_with_empty_kwargs`` when
+    using custom matplotlib default colors (:issue:`4345`)
   - Fix running of stata IO tests. Now uses temporary files to write
     (:issue:`4353`)
   - Fixed an issue where ``DataFrame.sum`` was slower than ``DataFrame.mean``

doc/source/v0.13.0.txt

@@ -51,6 +51,9 @@ Bug Fixes
   - Fixed bug in ``PeriodIndex.map`` where using ``str`` would return the str
     representation of the index (:issue:`4136`)
 
+  - Fixed test failure ``test_time_series_plot_color_with_empty_kwargs`` when
+    using custom matplotlib default colors (:issue:`4345`)
+
   - Fix running of stata IO tests. Now uses temporary files to write
     (:issue:`4353`)
 

pandas/tests/test_graphics.py

@@ -917,15 +917,18 @@ def test_time_series_plot_color_kwargs(self):
         self.assert_(line.get_color() == 'green')
 
     def test_time_series_plot_color_with_empty_kwargs(self):
+        import matplotlib as mpl
         import matplotlib.pyplot as plt
+        
+        def_colors = mpl.rcParams['axes.color_cycle']
 
         plt.close('all')
         for i in range(3):
             ax = Series(np.arange(12) + 1, index=date_range('1/1/2000',
                                                             periods=12)).plot()
 
         line_colors = [l.get_color() for l in ax.get_lines()]
-        self.assert_(line_colors == ['b', 'g', 'r'])
+        self.assertEqual(line_colors, def_colors[:3])
 
     @slow
     def test_grouped_hist(self):