BUG: axes.color_cycle from mpl rcParams should not be joined as singl…

…e string
neurodebian · Nov 14, 2012 · e374f0f · e374f0f
1 parent bf538a9
commit e374f0f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pandas/tests/test_graphics.py b/pandas/tests/test_graphics.py
@@ -537,6 +537,21 @@ def test_line_colors(self):
         plt.close('all')
         df.ix[:, [0]].plot(color='DodgerBlue')
 
+    @slow
+    def test_default_color_cycle(self):
+        import matplotlib.pyplot as plt
+        plt.rcParams['axes.color_cycle'] = list('rgbk')
+
+        plt.close('all')
+        df = DataFrame(np.random.randn(5, 3))
+        ax = df.plot()
+
+        lines = ax.get_lines()
+        for i, l in enumerate(lines):
+            xp = plt.rcParams['axes.color_cycle'][i]
+            rs = l.get_color()
+            self.assert_(xp == rs)
+
 
 class TestDataFrameGroupByPlots(unittest.TestCase):
 

diff --git a/pandas/tools/plotting.py b/pandas/tools/plotting.py
@@ -979,7 +979,9 @@ def _use_dynamic_x(self):
 
     def _get_colors(self):
         import matplotlib.pyplot as plt
-        cycle = ''.join(plt.rcParams.get('axes.color_cycle', list('bgrcmyk')))
+        cycle = plt.rcParams.get('axes.color_cycle', list('bgrcmyk'))
+        if isinstance(cycle, basestring):
+            cycle = list(cycle)
         has_colors = 'color' in self.kwds
         colors = self.kwds.get('color', cycle)
         return colors