Robustness and functionality for color=None.

smithsp · smithsp · commit 24d74b97e361 · 2014-11-26T15:05:59.000-08:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -232,8 +232,9 @@ def _xy_from_xy(self, x, y):
 
     def _makeline(self, x, y, kw, kwargs):
         kw = kw.copy()  # Don't modify the original kw.
+        kwargs = kwargs.copy()
         if kw.get('color',None) is None and kwargs.get('color',None) is None:
-            kw['color'] = six.next(self.color_cycle)
+            kwargs['color'] = kw['color'] = six.next(self.color_cycle)
             # (can't use setdefault because it always evaluates
             # its second argument)
         seg = mlines.Line2D(x, y,
