Skip to content

Commit 06251dd

Browse files
authored
CLN: de-duplicate _validate_where_value with _validate_setitem_value (#37595)
1 parent 4587f33 commit 06251dd

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

pandas/core/arrays/categorical.py

-5
Original file line numberDiff line numberDiff line change
@@ -1177,11 +1177,6 @@ def map(self, mapper):
11771177
# -------------------------------------------------------------
11781178
# Validators; ideally these can be de-duplicated
11791179

1180-
def _validate_where_value(self, value):
1181-
if is_scalar(value):
1182-
return self._validate_fill_value(value)
1183-
return self._validate_listlike(value)
1184-
11851180
def _validate_insert_value(self, value) -> int:
11861181
return self._validate_fill_value(value)
11871182

pandas/core/arrays/datetimelike.py

-2
Original file line numberDiff line numberDiff line change
@@ -623,8 +623,6 @@ def _validate_setitem_value(self, value):
623623

624624
return self._unbox(value, setitem=True)
625625

626-
_validate_where_value = _validate_setitem_value
627-
628626
def _validate_insert_value(self, value):
629627
value = self._validate_scalar(value)
630628

pandas/core/indexes/datetimelike.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ def where(self, cond, other=None):
485485
values = self._data._ndarray
486486

487487
try:
488-
other = self._data._validate_where_value(other)
488+
other = self._data._validate_setitem_value(other)
489489
except (TypeError, ValueError) as err:
490490
# Includes tzawareness mismatch and IncompatibleFrequencyError
491491
oth = getattr(other, "dtype", other)

pandas/core/indexes/extension.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def insert(self, loc: int, item):
343343

344344
def putmask(self, mask, value):
345345
try:
346-
value = self._data._validate_where_value(value)
346+
value = self._data._validate_setitem_value(value)
347347
except (TypeError, ValueError):
348348
return self.astype(object).putmask(mask, value)
349349

0 commit comments

Comments
 (0)