Skip to content

Commit 401d7a1

Browse files
authored
CLN: remove unnecessary _validate_foo methods (#37106)
1 parent 241740c commit 401d7a1

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

pandas/core/arrays/_mixins.py

+3-9
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,10 @@ def _validate_shift_value(self, fill_value):
180180
return self._validate_fill_value(fill_value)
181181

182182
def __setitem__(self, key, value):
183-
key = self._validate_setitem_key(key)
183+
key = check_array_indexer(self, key)
184184
value = self._validate_setitem_value(value)
185185
self._ndarray[key] = value
186186

187-
def _validate_setitem_key(self, key):
188-
return check_array_indexer(self, key)
189-
190187
def _validate_setitem_value(self, value):
191188
return value
192189

@@ -198,18 +195,15 @@ def __getitem__(self, key):
198195
return self._box_func(result)
199196
return self._from_backing_data(result)
200197

201-
key = self._validate_getitem_key(key)
198+
key = extract_array(key, extract_numpy=True)
199+
key = check_array_indexer(self, key)
202200
result = self._ndarray[key]
203201
if lib.is_scalar(result):
204202
return self._box_func(result)
205203

206204
result = self._from_backing_data(result)
207205
return result
208206

209-
def _validate_getitem_key(self, key):
210-
key = extract_array(key, extract_numpy=True)
211-
return check_array_indexer(self, key)
212-
213207
@doc(ExtensionArray.fillna)
214208
def fillna(self: _T, value=None, method=None, limit=None) -> _T:
215209
value, method = validate_fillna_kwargs(value, method)

pandas/core/arrays/datetimelike.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
from pandas.core.arrays._mixins import NDArrayBackedExtensionArray
6666
import pandas.core.common as com
6767
from pandas.core.construction import array, extract_array
68-
from pandas.core.indexers import check_setitem_lengths
68+
from pandas.core.indexers import check_array_indexer, check_setitem_lengths
6969
from pandas.core.ops.common import unpack_zerodim_and_defer
7070
from pandas.core.ops.invalid import invalid_comparison, make_invalid_op
7171

@@ -289,7 +289,7 @@ def _get_getitem_freq(self, key):
289289
elif self.ndim != 1:
290290
freq = None
291291
else:
292-
key = self._validate_getitem_key(key) # maybe ndarray[bool] -> slice
292+
key = check_array_indexer(self, key) # maybe ndarray[bool] -> slice
293293
freq = None
294294
if isinstance(key, slice):
295295
if self.freq is not None and key.step is not None:

0 commit comments

Comments
 (0)