Merge pull request #3855 from smithsp/v1.4.x

tacaswell · tacaswell · commit 711bacbea494 · 2014-11-29T17:35:02.000-05:00
ENH : Allow `color=None` to be passed to plotting functions.
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.
-        if 'color' not in kw and 'color' not in kwargs:
-            kw['color'] = six.next(self.color_cycle)
+        kwargs = kwargs.copy()
+        if kw.get('color', None) is None and kwargs.get('color', None) is None:
+            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,
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -3402,6 +3402,12 @@ def test_pathological_hexbin():
         plt.show()
         assert_equal(len(w), 0)
 
+@cleanup
+def test_color_None():
+    # issue 3855
+    fig, ax = plt.subplots()
+    ax.plot([1,2], [1,2], color=None)
+    plt.show()
 
 if __name__ == '__main__':
     import nose
