Merge branch 'colorcycle' of git://github.com/faucon/matplotlib

efiring · efiring · commit 8506c33c811e · 2011-03-23T09:03:01.000-10:00
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -248,7 +248,7 @@ def _xy_from_xy(self, x, y):
 
     def _makeline(self, x, y, kw, kwargs):
         kw = kw.copy() # Don't modify the original kw.
-        if not 'color' in kw:
+        if not 'color' in kw and not 'color' in kwargs.keys():
             kw['color'] = self.color_cycle.next()
             # (can't use setdefault because it always evaluates
             # its second argument)
