fixup

Author: MarcoGorelli

pandas/core/frame.py

@@ -10697,6 +10697,21 @@ def where(
     ):
         return super().where(cond, other, inplace, axis, level, errors, try_cast)
 
+    @deprecate_nonkeyword_arguments(
+        version=None, allowed_args=["self", "cond", "other"]
+    )
+    def mask(
+        self,
+        cond,
+        other=np.nan,
+        inplace=False,
+        axis=None,
+        level=None,
+        errors="raise",
+        try_cast=lib.no_default,
+    ):
+        return super().mask(cond, other, inplace, axis, level, errors, try_cast)
+
 
 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,
 )
@@ -9126,9 +9125,6 @@ def where(
         name="mask",
         name_other="where",
     )
-    @deprecate_nonkeyword_arguments(
-        version=None, allowed_args=["self", "cond", "other"]
-    )
     def mask(
         self,
         cond,
@@ -9148,7 +9144,7 @@ def mask(
                 "try_cast keyword is deprecated and will be removed in a "
                 "future version",
                 FutureWarning,
-                stacklevel=3,
+                stacklevel=4,
             )
 
         # see gh-21891

pandas/core/series.py

@@ -5343,6 +5343,21 @@ def where(
     ):
         return super().where(cond, other, inplace, axis, level, errors, try_cast)
 
+    @deprecate_nonkeyword_arguments(
+        version=None, allowed_args=["self", "cond", "other"]
+    )
+    def mask(
+        self,
+        cond,
+        other=np.nan,
+        inplace=False,
+        axis=None,
+        level=None,
+        errors="raise",
+        try_cast=lib.no_default,
+    ):
+        return super().mask(cond, other, inplace, axis, level, errors, try_cast)
+
     # ----------------------------------------------------------------------
     # Add index
     _AXIS_ORDERS = ["index"]

pandas/tests/frame/indexing/test_mask.py

@@ -93,18 +93,14 @@ def test_mask_dtype_bool_conversion(self):
     def test_mask_pos_args_deprecation(self):
         # https://github.com/pandas-dev/pandas/issues/41485
         df = DataFrame({"a": range(5)})
-
         expected = DataFrame({"a": [-1, 1, -1, 3, -1]})
         cond = df % 2 == 0
-
         msg = (
-            r"In a future version of pandas all arguments of NDFrame.mask except for "
+            r"In a future version of pandas all arguments of DataFrame.mask except for "
             r"the arguments 'cond' and 'other' will be keyword-only"
         )
-
         with tm.assert_produces_warning(FutureWarning, match=msg):
             result = df.mask(cond, -1, False)
-
         tm.assert_frame_equal(result, expected)
 
 

pandas/tests/series/indexing/test_mask.py

@@ -93,13 +93,10 @@ def test_mask_pos_args_deprecation():
     s = Series(range(5))
     expected = Series([-1, 1, -1, 3, -1])
     cond = s % 2 == 0
-
     msg = (
-        r"In a future version of pandas all arguments of NDFrame.mask except for "
+        r"In a future version of pandas all arguments of Series.mask except for "
         r"the arguments 'cond' and 'other' will be keyword-only"
     )
-
     with tm.assert_produces_warning(FutureWarning, match=msg):
         result = s.mask(cond, -1, False)
-
     tm.assert_series_equal(result, expected)

pandas/tests/series/indexing/test_where.py

@@ -328,7 +328,7 @@ def test_broadcast(size, mask, item, box):
     tm.assert_series_equal(result, expected)
 
     s = Series(data)
-    result = s.mask(selection, other=box(item))
+    result = s.mask(selection, box(item))
     tm.assert_series_equal(result, expected)