Fixed frame tests

pandas-dev · TomAugspurger · Jan 9, 2020 · Oct 21, 2019 · Oct 21, 2019 · Oct 21, 2019
commit 66acc90065dd14e09d780633c1c4029c3483fed2
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -4038,6 +4038,7 @@ def rename(
         mapper: Optional[
             Union[Mapping[Hashable, Hashable], Callable[[Hashable], Hashable]]
         ] = None,
+            *,
         index: Optional[
             Union[Mapping[Hashable, Hashable], Callable[[Hashable], Hashable]]
         ] = None,

diff --git a/pandas/core/generic.py b/pandas/core/generic.py
@@ -1019,6 +1019,7 @@ def rename(
         mapper: Optional[
             Union[Mapping[Hashable, Hashable], Callable[[Hashable], Hashable]]
            ] = None,
+            *,
         index: Optional[
             Union[Mapping[Hashable, Hashable], Callable[[Hashable], Hashable]]
         ] = None,
@@ -1143,7 +1144,7 @@ def rename(
 
         See the :ref:`user guide <basics.rename>` for more.
         """
-        if not (mapper or index or columns):
+        if mapper is None and index is None and columns is None:
             raise TypeError("must pass an index to rename")
 
         if (index or columns):

diff --git a/pandas/core/series.py b/pandas/core/series.py
@@ -4085,9 +4085,11 @@ def rename(
         index: Optional[
             Union[Hashable, Mapping[Hashable, Hashable], Callable[[Hashable], Hashable]]
         ] = None,
+            *,
         copy: bool = True,
         inplace: bool = Fal
8000
se,
         level: Optional[Level] = None,
+            errors: str = "ignore"
     ) -> "Series":
         """
         Alter Series index labels or name.
@@ -4149,12 +4151,10 @@ def rename(
         5    3
         dtype: int64
         """
-        kwargs["inplace"] = validate_bool_kwarg(kwargs.get("inplace", False), "inplace")
-
         if callable(index) or is_dict_like(index):
-            return super().rename(index=index, **kwargs)
+            return super().rename(index=index, copy=copy, inplace=inplace, level=level, errors=errors)
         else:
-            return self._set_name(index, inplace=kwargs.get("inplace"))
+            return self._set_name(index, inplace=inplace)
 
     @Substitution(**_shared_doc_kwargs)
     @Appender(generic.NDFrame.reindex.__doc__)

diff --git a/pandas/tests/frame/test_alter_axes.py b/pandas/tests/frame/test_alter_axes.py
@@ -1294,7 +1294,7 @@ def test_rename_mapper_multi(self):
     def test_rename_positional_named(self):
         # https://github.com/pandas-dev/pandas/issues/12392
         df = DataFrame({"a": [1, 2], "b": [1, 2]}, index=["X", "Y"])
-        result = df.rename(str.lower, columns=str.upper)
+        result = df.rename(index=str.lower, columns=str.upper)
         expected = DataFrame({"A": [1, 2], "B": [1, 2]}, index=["x", "y"])
         tm.assert_frame_equal(result, expected)
 
@@ -1318,12 +1318,12 @@ def test_rename_axis_style_raises(self):
 
         # Multiple targets and axis
         with pytest.raises(TypeError, match=over_spec_msg):
-            df.rename(str.lower, str.lower, axis="columns")
+            df.rename(str.lower, index=str.lower, axis="columns")
 
         # Too many targets
-        over_spec_msg = "Cannot specify all of 'mapper', 'index', 'columns'."
+        over_spec_msg = "Cannot specify both 'mapper' and any of 'index' or 'columns'"
         with pytest.raises(TypeError, match=over_spec_msg):
-            df.rename(str.lower, str.lower, str.lower)
+            df.rename(str.lower, index=str.lower, columns=str.lower)
 
         # Duplicates
         with pytest.raises(TypeError, match="multiple values"):
@@ -1357,16 +1357,11 @@ def test_reindex_api_equivalence(self):
         for res in [res2, res3]:
             tm.assert_frame_equal(res1, res)
 
-    def test_rename_positional(self):
+    def test_rename_positional_raises(self):
         df = DataFrame(columns=["A", "B"])
-        with tm.assert_produces_warning(FutureWarning) as rec:
-            result = df.rename(None, str.lower)
-        expected = DataFrame(columns=["a", "b"])
-        tm.assert_frame_equal(result, expected)
-        assert len(rec) == 1
-        message = str(rec[0].message)
-        assert "rename" in message
-        assert "Use named arguments" in message
+        msg = r"rename\(\) takes from 1 to 2 positional arguments"
+        with pytest.raises(TypeError, match=msg):
+            df.rename(None, str.lower)
 
     def test_assign_columns(self, float_frame):
         float_frame["hi"] = "there"
@@ -1391,14 +1386,6 @@ def test_set_index_preserve_categorical_dtype(self):
             result = result.reindex(columns=df.columns)
             tm.assert_frame_equal(result, df)
 
-    def test_ambiguous_warns(self):
-        df = DataFrame({"A": [1, 2]})
-        with tm.assert_produces_warning(FutureWarning):
-            df.rename(id, id)
-
-        with tm.assert_produces_warning(FutureWarning):
-            df.rename({0: 10}, {"A": "B"})
-
     def test_rename_signature(self):
         sig = inspect.signature(DataFrame.rename)
         parameters = set(sig.parameters)