fixup after merge

Author: MarcoGorelli

pandas/core/frame.py

@@ -77,6 +77,7 @@
     Appender,
     Substitution,
     deprecate_kwarg,
+    deprecate_nonkeyword_arguments,
     doc,
     rewrite_axis_style_signature,
 )
@@ -10626,6 +10627,29 @@ def _values(self) -> np.ndarray:
         """internal implementation"""
         return self.values
 
+    @deprecate_nonkeyword_arguments(version=None, allowed_args=["self", "method"])
+    def interpolate(
+        self: DataFrame,
+        method: str = "linear",
+        axis: Axis = 0,
+        limit: int | None = None,
+        inplace: bool = False,
+        limit_direction: str | None = None,
+        limit_area: str | None = None,
+        downcast: str | None = None,
+        **kwargs,
+    ) -> DataFrame | None:
+        return super().interpolate(
+            method,
+            axis,
+            limit,
+            inplace,
+            limit_direction,
+            limit_area,
+            downcast,
+            **kwargs,
+        )
+
 
 DataFrame._add_numeric_operations()
 

pandas/core/generic.py

@@ -61,7 +61,6 @@
     InvalidIndexError,
 )
 from pandas.util._decorators import (
-    deprecate_nonkeyword_arguments,
     doc,
     rewrite_axis_style_signature,
 )
@@ -6697,8 +6696,6 @@ def replace(
         else:
             return result.__finalize__(self, method="replace")
 
-    @deprecate_nonkeyword_arguments(version="2.0", allowed_args=["self", "method"])
-    @final
     def interpolate(
         self: FrameOrSeries,
         method: str = "linear",

pandas/core/series.py

@@ -51,6 +51,7 @@
 from pandas.util._decorators import (
     Appender,
     Substitution,
+    deprecate_nonkeyword_arguments,
     doc,
 )
 from pandas.util._validators import (
@@ -5256,6 +5257,29 @@ def to_period(self, freq=None, copy=True) -> Series:
             self, method="to_period"
         )
 
+    @deprecate_nonkeyword_arguments(version=None, allowed_args=["self", "method"])
+    def interpolate(
+        self: Series,
+        method: str = "linear",
+        axis: Axis = 0,
+        limit: int | None = None,
+        inplace: bool = False,
+        limit_direction: str | None = None,
+        limit_area: str | None = None,
+        downcast: str | None = None,
+        **kwargs,
+    ) -> Series | None:
+        return super().interpolate(
+            method,
+            axis,
+            limit,
+            inplace,
+            limit_direction,
+            limit_area,
+            downcast,
+            **kwargs,
+        )
+
     # ----------------------------------------------------------------------
     # Add index
     _AXIS_ORDERS = ["index"]

pandas/tests/frame/methods/test_interpolate.py

@@ -347,8 +347,8 @@ def test_interpolate_pos_args_deprecation(self):
         # https://github.com/pandas-dev/pandas/issues/41485
         df = DataFrame({"a": [1, 2, 3]})
         msg = (
-            r"Starting with Pandas version 2\.0 all arguments of interpolate except "
-            r"for the arguments 'self' and 'method' will be keyword-only"
+            r"In a future version of pandas all arguments of DataFrame.interpolate "
+            r"except for the argument 'method' will be keyword-only"
         )
         with tm.assert_produces_warning(FutureWarning, match=msg):
             df.interpolate("pad", 0)

pandas/tests/series/methods/test_interpolate.py

@@ -816,8 +816,8 @@ def test_interpolate_pos_args_deprecation(self):
         # https://github.com/pandas-dev/pandas/issues/41485
         ser = Series([1, 2, 3])
         msg = (
-            r"Starting with Pandas version 2\.0 all arguments of interpolate except "
-            r"for the arguments 'self' and 'method' will be keyword-only"
+            r"In a future version of pandas all arguments of Series.interpolate except "
+            r"for the argument 'method' will be keyword-only"
         )
         with tm.assert_produces_warning(FutureWarning, match=msg):
             ser.interpolate("pad", 0)