BUG: except raised if plot parameters has both color and style with color #2588

Author: changhiskhan

pandas/tools/plotting.py

@@ -1050,6 +1050,7 @@ def _get_colors(self):
         return colors
 
     def _maybe_add_color(self, colors, kwds, style, i):
+        kwds.pop('color', None)
         if style is None or re.match('[a-z]+', style) is None:
             kwds['color'] = colors[i % len(colors)]
 

pandas/tseries/tests/test_plotting.py

@@ -97,6 +97,18 @@ def test_tsplot(self):
         ax = ts.plot(style='k')
         self.assert_((0., 0., 0.) == ax.get_lines()[0].get_color())
 
+    @slow
+    def test_both_style_and_color(self):
+        import matplotlib.pyplot as plt
+        plt.close('all')
+
+        ts = tm.makeTimeSeries()
+        ts.plot(style='b-', color='#000099') #works
+
+        plt.close('all')
+        s = ts.reset_index(drop=True)
+        s.plot(style='b-', color='#000099') #non-tsplot
+
     @slow
     def test_high_freq(self):
         freaks = ['ms', 'us']