Merge pull request #4198 from efiring/plot_color_alias

tacaswell · tacaswell · commit 3f03e2e24f8c · 2015-03-22T23:06:12.000-04:00
FIX : convert 'c' to 'color' immediately in plot closes #4162, closes #4157, closes #4262
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1370,6 +1370,12 @@ def plot(self, *args, **kwargs):
             self.cla()
         lines = []
 
+        # Convert "c" alias to "color" immediately, to avoid
+        # confusion farther on.
+        c = kwargs.pop('c', None)
+        if c is not None:
+            kwargs['color'] = c
+
         for line in self._get_lines(*args, **kwargs):
             self.add_line(line)
             lines.append(line)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -3433,6 +3433,13 @@ def test_color_None():
     ax.plot([1,2], [1,2], color=None)
     plt.show()
 
+@cleanup
+def test_color_alias():
+    # issues 4157 and 4162
+    fig, ax = plt.subplots()
+    line = ax.plot([0, 1], c='lime')[0]
+    assert_equal('lime', line.get_color())
+
 @cleanup
 def test_numerical_hist_label():
     fig, ax = plt.subplots()
