pandas-dev · sanggon6107 · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025 · Jan 23, 2025
diff --git a/doc/source/whatsnew/v3.0.0.rst b/doc/source/whatsnew/v3.0.0.rst
@@ -676,6 +676,7 @@ Interval
 
 Indexing
 ^^^^^^^^
+- Bug in :func:`Series.mask` unexpectedly filling pd.NA (:issue:`60729`)
 - Bug in :meth:`DataFrame.__getitem__` returning modified columns when called with ``slice`` in Python 3.12 (:issue:`57500`)
 - Bug in :meth:`DataFrame.from_records` throwing a ``ValueError`` when passed an empty list in ``index`` (:issue:`58594`)
 - Bug in :meth:`MultiIndex.insert` when a new value inserted to a datetime-like level gets cast to ``NaT`` and fails indexing (:issue:`60388`)

diff --git a/pandas/core/generic.py b/pandas/core/generic.py
@@ -9674,6 +9674,13 @@ def _where(
  if axis is not None:
  axis = self._get_axis_number(axis)
 
+ # We should not be filling NA. See GH#60729
 # make sure we are boolean 
 fill_value = bool(inplace) 
 cond = cond.fillna(fill_value) 
 cond = cond.infer_objects() 
 # make sure we are boolean 
 fill_value = bool(inplace) 
 cond = cond.fillna(fill_value) 
 cond = cond.infer_objects() 
 if not isinstance(cond, ABCDataFrame): 
 # This is a single-dimensional object. 
 if not is_bool_dtype(cond): 
 raise TypeError(msg.format(dtype=cond.dtype)) 
 else: 
 for _dt in cond.dtypes: 
 if not is_bool_dtype(_dt): 
 raise TypeError(msg.format(dtype=_dt)) 
 if cond._mgr.any_extension_types: 
 # GH51574: avoid object ndarray conversion later on 
 cond = cond._constructor( 
 cond.to_numpy(dtype=bool, na_value=fill_value), 
 **cond._construct_axes_dict(), 
 ) 
 def where(self, other, cond) -> list[Block]: 
 arr = self.values.T 
 cond = extract_bool_array(cond) 
 def extract_bool_array(mask: ArrayLike) -> npt.NDArray[np.bool_]: 
 """ 
  If we have a SparseArray or BooleanArray, convert it to ndarray[bool]. 
  """ 
 if isinstance(mask, ExtensionArray): 
 # We could have BooleanArray, Sparse[bool], ... 
 # Except for BooleanArray, this is equivalent to just 
 # np.asarray(mask, dtype=bool) 
 mask = mask.to_numpy(dtype=bool, na_value=False) 
 mask = np.asarray(mask, dtype=bool) 
 return mask 
 # make sure we are boolean 
 fill_value = bool(inplace) 
 cond = cond.fillna(fill_value) 
 cond = cond.infer_objects() 
 # make sure we are boolean 
 fill_value = bool(inplace) 
 cond = cond.fillna(fill_value) 
 cond = cond.infer_objects() 
 if not isinstance(cond, ABCDataFrame): 
 # This is a single-dimensional object. 
 if not is_bool_dtype(cond): 
 raise TypeError(msg.format(dtype=cond.dtype)) 
 else: 
 for _dt in cond.dtypes: 
 if not is_bool_dtype(_dt): 
 raise TypeError(msg.format(dtype=_dt)) 
 if cond._mgr.any_extension_types: 
 # GH51574: avoid object ndarray conversion later on 
 cond = cond._constructor( 
 cond.to_numpy(dtype=bool, na_value=fill_value), 
 **cond._construct_axes_dict(), 
 ) 
 def where(self, other, cond) -> list[Block]: 
 arr = self.values.T 
 
 cond = extract_bool_array(cond) 
 
 def extract_bool_array(mask: ArrayLike) -> npt.NDArray[np.bool_]: 
 """ 
  If we have a SparseArray or BooleanArray, convert it to ndarray[bool]. 
  """ 
 if isinstance(mask, ExtensionArray): 
 # We could have BooleanArray, Sparse[bool], ... 
 # Except for BooleanArray, this is equivalent to just 
 # np.asarray(mask, dtype=bool) 
 mask = mask.to_numpy(dtype=bool, na_value=False) 
 
 mask = np.asarray(mask, dtype=bool) 
 return mask 
+ if isinstance(cond, np.ndarray):
+ cond = np.array(cond)
+ cond[np.isnan(cond)] = True
+ elif isinstance(cond, NDFrame):
+ cond = cond.fillna(True)
 # see gh-21891 
 if not hasattr(cond, "__invert__"): 
 cond = np.array(cond) 
 else: 
 if not hasattr(cond, "shape"): 
 cond = np.asanyarray(cond) 
 if cond.shape != self.shape: 
 raise ValueError("Array conditional must be same shape as self") 
 cond = self._constructor(cond, **self._construct_axes_dict(), copy=False) 
 # see gh-21891 
 if not hasattr(cond, "__invert__"): 
 cond = np.array(cond) 
 else: 
 if not hasattr(cond, "shape"): 
 cond = np.asanyarray(cond) 
 if cond.shape != self.shape: 
 raise ValueError("Array conditional must be same shape as self") 
 cond = self._constructor(cond, **self._construct_axes_dict(), copy=False) 
+
  # align the cond to same shape as myself
  cond = common.apply_if_callable(cond, self)
  if isinstance(cond, NDFrame):

diff --git a/pandas/tests/series/indexing/test_mask.py b/pandas/tests/series/indexing/test_mask.py
@@ -67,3 +67,19 @@ def test_mask_inplace():
  rs = s.copy()
  rs.mask(cond, -s, inplace=True)
  tm.assert_series_equal(rs, s.mask(cond, -s))
+
+
+def test_mask_na():
+ # We should not be filling pd.NA. See GH#60729
+ series = Series([None, 1, 2, None, 3, 4, None])
+ series = series.convert_dtypes()
+ cond = series <= 2
+
+ maskres = series.mask(cond, -99)
+ whereres = series.where(~(cond), -99)
+
+ expected = Series([None, -99, -99, None, 3, 4, None])
+ expected = expected.convert_dtypes()
+
+ tm.assert_series_equal(maskres, expected)
+ tm.assert_series_equal(maskres, whereres)