Skip to content

REF: remove iloc case from _convert_slice_indexer #31786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 9, 2020
Merged

REF: remove iloc case from _convert_slice_indexer #31786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a076e6a
REF: remove iloc case from _convert_slice_indexer
jbrockmendel Feb 7, 2020
dad937e
Merge branch 'master' of https://github.com/pandas-dev/pandas into po…
jbrockmendel Feb 8, 2020
a3b27f9
Merge branch 'master' of https://github.com/pandas-dev/pandas into po…
jbrockmendel Feb 9, 2020
35c36c7
post-merge fixup
jbrockmendel Feb 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions pandas/core/indexes/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3142,6 +3142,15 @@ def _convert_scalar_indexer(self, key, kind: str_t):

return key

def _validate_positional_slice(self, key: slice):
"""
For positional indexing, a slice must have either int or None
for each of start, stop, and step.
"""
self._validate_indexer("positional", key.start, "iloc")
self._validate_indexer("positional", key.stop, "iloc")
self._validate_indexer("positional", key.step, "iloc")

def _convert_slice_indexer(self, key: slice, kind=None):
"""
Convert a slice indexer.
Expand All @@ -3152,16 +3161,9 @@ def _convert_slice_indexer(self, key: slice, kind=None):
Parameters
----------
key : label of the slice bound
kind : {'loc', 'getitem', 'iloc'} or None
kind : {'loc', 'getitem'} or None
"""
assert kind in ["loc", "getitem", "iloc", None]

# validate iloc
if kind == "iloc":
self._validate_indexer("positional", key.start, "iloc")
self._validate_indexer("positional", key.stop, "iloc")
self._validate_indexer("positional", key.step, "iloc")
return key
assert kind in ["loc", "getitem", None], kind

# potentially cast the bounds to integers
start, stop, step = key.start, key.stop, key.step
Expand Down
5 changes: 2 additions & 3 deletions pandas/core/indexes/numeric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,10 +394,9 @@ def _convert_scalar_indexer(self, key, kind: str):

@Appender(Index._convert_slice_indexer.__doc__)
def _convert_slice_indexer(self, key: slice, kind=None):
assert kind in ["loc", "getitem", None]

if kind == "iloc":
return super()._convert_slice_indexer(key, kind=kind)

# We always treat __getitem__ slicing as label-based
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure this comment is correct? (eg for a series with Int64Index, slicing is positional?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this method is for Float64Index

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, missed that in the diff. Thanks!

# translate to locations
return self.slice_indexer(key.start, key.stop, key.step, kind=kind)

Expand Down
9 changes: 5 additions & 4 deletions pandas/core/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,7 +1685,7 @@ def _get_slice_axis(self, slice_obj: slice, axis: int):

labels = obj._get_axis(axis)
indexer = labels.slice_indexer(
slice_obj.start, slice_obj.stop, slice_obj.step, kind=self.name
slice_obj.start, slice_obj.stop, slice_obj.step, kind="loc"
)

if isinstance(indexer, slice):
Expand Down Expand Up @@ -2035,8 +2035,8 @@ def _get_slice_axis(self, slice_obj: slice, axis: int):
return obj.copy(deep=False)

labels = obj._get_axis(axis)
indexer = labels._convert_slice_indexer(slice_obj, kind="iloc")
return self.obj._slice(indexer, axis=axis, kind="iloc")
labels._validate_positional_slice(slice_obj)
return self.obj._slice(slice_obj, axis=axis, kind="iloc")

def _convert_to_indexer(self, key, axis: int, is_setter: bool = False):
"""
Expand All @@ -2046,7 +2046,8 @@ def _convert_to_indexer(self, key, axis: int, is_setter: bool = False):

# make need to convert a float key
if isinstance(key, slice):
return labels._convert_slice_indexer(key, kind="iloc")
labels._validate_positional_slice(key)
return key

elif is_float(key):
labels._validate_indexer("positional", key, "iloc")
Expand Down
7 changes: 5 additions & 2 deletions pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,10 @@ def _ixs(self, i: int, axis: int = 0):

def _slice(self, slobj: slice, axis: int = 0, kind: str = "getitem") -> "Series":
assert kind in ["getitem", "iloc"]
slobj = self.index._convert_slice_indexer(slobj, kind=kind)
if kind == "getitem":
# If called from getitem, we need to determine whether
# this slice is positional or label-based.
slobj = self.index._convert_slice_indexer(slobj, kind="getitem")
return self._get_values(slobj)

def __getitem__(self, key):
Expand Down Expand Up @@ -884,7 +887,7 @@ def __getitem__(self, key):
def _get_with(self, key):
# other: fancy integer or otherwise
if isinstance(key, slice):
return self._slice(key)
return self._slice(key, kind="getitem")
elif isinstance(key, ABCDataFrame):
raise TypeError(
"Indexing a Series with DataFrame is not "
Expand Down