Finish up

Author: rhshadrach

pandas/core/arrays/string_arrow.py

@@ -241,7 +241,7 @@ def insert(self, loc: int, item) -> ArrowStringArray:
         return super().insert(loc, item)
 
     def _convert_bool_result(self, values, na=lib.no_default, method_name=None):
-        validate_na_arg(na, name="na", allow_no_default=True, allow_bool=True)
+        validate_na_arg(na, name="na")
         if self.dtype.na_value is np.nan:
             if na is lib.no_default or isna(na):
                 # NaN propagates as False

pandas/core/strings/object_array.py

@@ -144,7 +144,7 @@ def _str_contains(
         na=lib.no_default,
         regex: bool = True,
     ):
-        validate_na_arg(na, name="na", allow_no_default=True, allow_bool=True)
+        validate_na_arg(na, name="na")
         if regex:
             if not case:
                 flags |= re.IGNORECASE
@@ -161,12 +161,12 @@ def _str_contains(
         return self._str_map(f, na, dtype=np.dtype("bool"))
 
     def _str_startswith(self, pat, na=lib.no_default):
-        validate_na_arg(na, name="na", allow_no_default=True, allow_bool=True)
+        validate_na_arg(na, name="na")
         f = lambda x: x.startswith(pat)
         return self._str_map(f, na_value=na, dtype=np.dtype(bool))
 
     def _str_endswith(self, pat, na=lib.no_default):
-        validate_na_arg(na, name="na", allow_no_default=True, allow_bool=True)
+        validate_na_arg(na, name="na")
         f = lambda x: x.endswith(pat)
         return self._str_map(f, na_value=na, dtype=np.dtype(bool))
 

pandas/tests/strings/test_find_replace.py

@@ -176,7 +176,7 @@ def test_contains_na_kwarg_for_nullable_string_dtype(
     values = Series(["a", "b", "c", "a", np.nan], dtype=nullable_string_dtype)
 
     if na in [0, 3] and na is not False:
-        msg = f"na must be a valid NA value; got {na}"
+        msg = f"na must be an NA value, True, or False; got {na}"
         with pytest.raises(ValueError, match=msg):
             values.str.contains("a", na=na, regex=regex)
     else:
@@ -252,7 +252,7 @@ def test_contains_nan(any_string_dtype):
     expected = Series([True, True, True], dtype=expected_dtype)
     tm.assert_series_equal(result, expected)
 
-    msg = "na must be a valid NA value; got foo"
+    msg = "na must be an NA value, True, or False; got foo"
     with pytest.raises(ValueError, match=msg):
         s.str.contains("foo", na="foo")
 
@@ -339,7 +339,7 @@ def test_startswith_endswith_validate_na(any_string_dtype):
         ["om", np.nan, "foo_nom", "nom", "bar_foo", np.nan, "foo"],
         dtype=any_string_dtype,
     )
-    msg = "na must be a valid NA value; got baz"
+    msg = "na must be an NA value, True, or False; got baz"
     with pytest.raises(ValueError, match=msg):
         ser.str.startswith("kapow", na="baz")
     with pytest.raises(ValueError, match=msg):

pandas/util/_validators.py

@@ -270,9 +270,7 @@ def validate_bool_kwarg(
     return value
 
 
-def validate_na_arg(
-    value, name: str, allow_no_default: bool = False, allow_bool: bool = False
-):
+def validate_na_arg(value, name: str):
     """
     Validate na arguments.
 
@@ -282,23 +280,15 @@ def validate_na_arg(
         Value to validate.
     name : str
         Name of the argument, used to raise an informative error message.
-    allow_no_default : bool, default False
-        Whether to allow ``value`` to be ``lib.no_default``.
-    allow_bool : bool, default False
-        Whether to allow ``value`` to be an instance of bool.
 
     Raises
     ______
     ValueError
         When ``value`` is determined to be invalid.
     """
-    if allow_no_default and value is lib.no_default:
+    if value is lib.no_default or isinstance(value, bool) or isna(value):
         return
-    if allow_bool and isinstance(value, bool):
-        return
-    if isna(value):
-        return
-    raise ValueError(f"{name} must be a valid NA value; got {value}")
+    raise ValueError(f"{name} must be an NA value, True, or False; got {value}")
 
 
 def validate_fillna_kwargs(value, method, validate_scalar_dict_value: bool = True):