Skip to content

Commit d7996b9

Browse files
authored
CLN: disallow kind=None in _convert_slice_indexer (#31832)
1 parent 39e9b35 commit d7996b9

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

pandas/core/indexes/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3152,7 +3152,7 @@ def _validate_positional_slice(self, key: slice):
31523152
self._validate_indexer("positional", key.stop, "iloc")
31533153
self._validate_indexer("positional", key.step, "iloc")
31543154

3155-
def _convert_slice_indexer(self, key: slice, kind=None):
3155+
def _convert_slice_indexer(self, key: slice, kind: str_t):
31563156
"""
31573157
Convert a slice indexer.
31583158
@@ -3162,9 +3162,9 @@ def _convert_slice_indexer(self, key: slice, kind=None):
31623162
Parameters
31633163
----------
31643164
key : label of the slice bound
3165-
kind : {'loc', 'getitem'} or None
3165+
kind : {'loc', 'getitem'}
31663166
"""
3167-
assert kind in ["loc", "getitem", None], kind
3167+
assert kind in ["loc", "getitem"], kind
31683168

31693169
# potentially cast the bounds to integers
31703170
start, stop, step = key.start, key.stop, key.step

pandas/core/indexes/interval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ def get_indexer_for(self, target: AnyArrayLike, **kwargs) -> np.ndarray:
885885
return self.get_indexer_non_unique(target)[0]
886886
return self.get_indexer(target, **kwargs)
887887

888-
def _convert_slice_indexer(self, key: slice, kind=None):
888+
def _convert_slice_indexer(self, key: slice, kind: str):
889889
if not (key.step is None or key.step == 1):
890890
raise ValueError("cannot support not-default step in a slice")
891891
return super()._convert_slice_indexer(key, kind)

pandas/core/indexes/numeric.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ def _convert_scalar_indexer(self, key, kind: str):
393393
return key
394394

395395
@Appender(Index._convert_slice_indexer.__doc__)
396-
def _convert_slice_indexer(self, key: slice, kind=None):
397-
assert kind in ["loc", "getitem", None]
396+
def _convert_slice_indexer(self, key: slice, kind: str):
397+
assert kind in ["loc", "getitem"]
398398

399399
# We always treat __getitem__ slicing as label-based
400400
# translate to locations

pandas/core/indexing.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -843,9 +843,6 @@ def _setitem_with_indexer(self, indexer, value):
843843
value = getattr(value, "values", value).ravel()
844844

845845
# we can directly set the series here
846-
# as we select a slice indexer on the mi
847-
if isinstance(idx, slice):
848-
idx = index._convert_slice_indexer(idx)
849846
obj._consolidate_inplace()
850847
obj = obj.copy()
851848
obj._data = obj._data.setitem(indexer=tuple([idx]), value=value)

0 commit comments

Comments
 (0)