remove c for bar and hbar

Author: Moritz Schreiber

pandas/plotting/_core.py

@@ -1127,13 +1127,6 @@ def bar(self, x=None, y=None, **kwargs):
         axis of the plot shows the specific categories being compared, and the
         other axis represents a measured value.
         """
-        c = kwargs.pop("c", None)
-        color = kwargs.pop("color", None)
-        if c is not None and color is not None:
-            raise TypeError("Specify exactly one of `c` and `color`")
-        elif c is not None or color is not None:
-            kwargs["color"] = color if color is not None else c
-
         return self(kind="bar", x=x, y=y, **kwargs)
 
     @Appender(
@@ -1220,13 +1213,6 @@ def barh(self, x=None, y=None, **kwargs):
         axis of the plot shows the specific categories being compared, and the
         other axis represents a measured value.
         """
-        c = kwargs.pop("c", None)
-        color = kwargs.pop("color", None)
-        if c is not None and color is not None:
-            raise TypeError("Specify exactly one of `c` and `color`")
-        elif c is not None or color is not None:
-            kwargs["color"] = color if color is not None else c
-
         return self(kind="barh", x=x, y=y, **kwargs)
 
     def box(self, by=None, **kwargs):

pandas/tests/plotting/frame/test_frame.py

@@ -832,9 +832,6 @@ def test_plot_bar(self):
 
         df = DataFrame({"a": [0, 1], "b": [1, 0]})
 
-        with pytest.raises(TypeError, match="Specify exactly one of `c` and `color`"):
-            df.plot.bar(x="a", y="b", c="red", color="green")
-
         ax = _check_plot_works(df.plot.bar)
         self._check_ticks_props(ax, xrot=90)
 

pandas/tests/plotting/frame/test_frame_color.py

@@ -119,10 +119,9 @@ def test_bar_colors(self):
         tm.close()
 
         custom_colors = "rgcby"
-        for kw in ["c", "color"]:
-            ax = df.plot.bar(**{kw: "rgcby"})
-            self._check_colors(ax.patches[::5], facecolors=custom_colors)
-            tm.close()
+        ax = df.plot.bar(color="rgcby")
+        self._check_colors(ax.patches[::5], facecolors=custom_colors)
+        tm.close()
 
         from matplotlib import cm
 
@@ -138,17 +137,15 @@ def test_bar_colors(self):
         self._check_colors(ax.patches[::5], facecolors=rgba_colors)
         tm.close()
 
-        for kw in ["c", "color"]:
-            ax = df.loc[:, [0]].plot.bar(**{kw: "DodgerBlue"})
-            self._check_colors([ax.patches[0]], facecolors=["DodgerBlue"])
-            tm.close()
+        ax = df.loc[:, [0]].plot.bar(color="DodgerBlue")
+        self._check_colors([ax.patches[0]], facecolors=["DodgerBlue"])
+        tm.close()
 
         ax = df.plot(kind="bar", color="green")
         self._check_colors(ax.patches[::5], facecolors=["green"] * 5)
         tm.close()
 
-    @pytest.mark.parametrize("kw", ["c", "color"])
-    def test_bar_user_colors(self, kw):
+    def test_bar_user_colors(self):
         df = DataFrame(
             {"A": range(4), "B": range(1, 5), "color": ["red", "blue", "blue", "red"]}
         )
@@ -160,7 +157,7 @@ def test_bar_user_colors(self, kw):
             (0.0, 0.0, 1.0, 1.0),
             (1.0, 0.0, 0.0, 1.0),
         ]
-        ax = df.plot.bar(y="A", **{kw: df["color"]})
+        ax = df.plot.bar(y="A", color=df["color"])
         result = [p.get_facecolor() for p in ax.patches]
         assert result == expected
 
@@ -216,17 +213,15 @@ def test_if_scatterplot_colorbars_are_next_to_parent_axes(self):
         assert np.isclose(parent_distance, colorbar_distance, atol=1e-7).all()
 
     @pytest.mark.parametrize("cmap", [None, "Greys"])
-    def test_scatter_with_c_column_name_with_colors(self, cmap):
+    @pytest.mark.parametrize("kw", ["c", "color"])
+    def test_scatter_with_c_column_name_with_colors(self, cmap, kw):
         # https://github.com/pandas-dev/pandas/issues/34316
         df = DataFrame(
             [[5.1, 3.5], [4.9, 3.0], [7.0, 3.2], [6.4, 3.2], [5.9, 3.0]],
             columns=["length", "width"],
         )
         df["species"] = ["r", "r", "g", "g", "b"]
-        ax = df.plot.scatter(x=0, y=1, c="species", cmap=cmap)
-        assert ax.collections[0].colorbar is None
-
-        ax = df.plot.scatter(x=0, y=1, color="species", cmap=cmap)
+        ax = df.plot.scatter(x=0, y=1, cmap=cmap, **{kw: "species"})
         assert ax.collections[0].colorbar is None
 
     def test_scatter_colors(self):

pandas/tests/plotting/test_series.py

@@ -268,8 +268,7 @@ def test_bar_ignore_index(self):
         ax = df.plot.bar(use_index=False, ax=ax)
         self._check_text_labels(ax.get_xticklabels(), ["0", "1", "2", "3"])
 
-    @pytest.mark.parametrize("kw", ["c", "color"])
-    def test_bar_user_colors(self, kw):
+    def test_bar_user_colors(self):
         s = Series([1, 2, 3, 4])
 
         expected = [
@@ -279,7 +278,7 @@ def test_bar_user_colors(self, kw):
             (1.0, 0.0, 0.0, 1.0),
         ]
 
-        ax = s.plot.bar(**{kw: ["red", "blue", "blue", "red"]})
+        ax = s.plot.bar(color=["red", "blue", "blue", "red"])
         result = [p.get_facecolor() for p in ax.patches]
         assert result == expected