CLN: inline indexing 1-liners

pandas/core/generic.py

@@ -3499,7 +3499,9 @@ def _iget_item_cache(self, item):
     def _box_item_values(self, key, values):
         raise AbstractMethodError(self)
 
-    def _slice(self: FrameOrSeries, slobj: slice, axis=0, kind=None) -> FrameOrSeries:
+    def _slice(
+        self: FrameOrSeries, slobj: slice, axis=0, kind: str = "getitem"
+    ) -> FrameOrSeries:
         """
         Construct a slice of this container.
 

pandas/core/indexing.py

@@ -591,12 +591,6 @@ def _get_label(self, label, axis: int):
 
         return self.obj._xs(label, axis=axis)
 
-    def _get_loc(self, key: int, axis: int):
-        return self.obj._ixs(key, axis=axis)
-
-    def _slice(self, obj, axis: int, kind=None):
-        return self.obj._slice(obj, axis=axis, kind=kind)
-
     def _get_setitem_indexer(self, key):
         if self.axis is not None:
             return self._convert_tuple(key)
@@ -700,17 +694,6 @@ def _convert_tuple(self, key):
                 keyidx.append(idx)
         return tuple(keyidx)
 
-    def _convert_scalar_indexer(self, key, axis: int):
-        # if we are accessing via lowered dim, use the last dim
-        ax = self.obj._get_axis(min(axis, self.ndim - 1))
-        # a scalar
-        return ax._convert_scalar_indexer(key, kind=self.name)
-
-    def _convert_slice_indexer(self, key: slice, axis: int):
-        # if we are accessing via lowered dim, use the last dim
-        ax = self.obj._get_axis(min(axis, self.ndim - 1))
-        return ax._convert_slice_indexer(key, kind=self.name)
-
     def _has_valid_setitem_indexer(self, indexer) -> bool:
         return True
 
@@ -1635,7 +1618,8 @@ def _validate_key(self, key, axis: int):
             return
 
         if not is_list_like_indexer(key):
-            self._convert_scalar_indexer(key, axis)
+            labels = self.obj._get_axis(axis)
+            labels._convert_scalar_indexer(key, kind="loc")
 
     def _is_scalar_access(self, key: Tuple) -> bool:
         """
@@ -1780,7 +1764,7 @@ def _get_slice_axis(self, slice_obj: slice, axis: int):
         )
 
         if isinstance(indexer, slice):
-            return self._slice(indexer, axis=axis, kind="iloc")
+            return self.obj._slice(indexer, axis=axis, kind="iloc")
         else:
             # DatetimeIndex overrides Index.slice_indexer and may
             #  return a DatetimeIndex instead of a slice object.
@@ -1804,11 +1788,11 @@ def _convert_to_indexer(self, key, axis: int):
         labels = self.obj._get_axis(axis)
 
         if isinstance(key, slice):
-            return self._convert_slice_indexer(key, axis)
+            return labels._convert_slice_indexer(key, kind="loc")
 
         # try to find out correct indexer, if not type correct raise
         try:
-            key = self._convert_scalar_indexer(key, axis)
+            key = labels._convert_scalar_indexer(key, kind="loc")
         except TypeError:
             # but we will allow setting
             pass
@@ -2031,7 +2015,7 @@ def _getitem_axis(self, key, axis: int):
             # validate the location
             self._validate_integer(key, axis)
 
-            return self._get_loc(key, axis=axis)
+            return self.obj._ixs(key, axis=axis)
 
     def _get_slice_axis(self, slice_obj: slice, axis: int):
         # caller is responsible for ensuring non-None axis
@@ -2040,19 +2024,22 @@ def _get_slice_axis(self, slice_obj: slice, axis: int):
         if not need_slice(slice_obj):
             return obj.copy(deep=False)
 
-        indexer = self._convert_slice_indexer(slice_obj, axis)
-        return self._slice(indexer, axis=axis, kind="iloc")
+        labels = obj._get_axis(axis)
+        indexer = labels._convert_slice_indexer(slice_obj, kind="iloc")
+        return self.obj._slice(indexer, axis=axis, kind="iloc")
 
     def _convert_to_indexer(self, key, axis: int):
         """
         Much simpler as we only have to deal with our valid types.
         """
+        labels = self.obj._get_axis(axis)
+
         # make need to convert a float key
         if isinstance(key, slice):
-            return self._convert_slice_indexer(key, axis)
+            return labels._convert_slice_indexer(key, kind="iloc")
 
         elif is_float(key):
-            return self._convert_scalar_indexer(key, axis)
+            return labels._convert_scalar_indexer(key, kind="iloc")
 
         try:
             self._validate_key(key, axis)

pandas/core/series.py

@@ -841,8 +841,9 @@ def _ixs(self, i: int, axis: int = 0):
         """
         return self._values[i]
 
-    def _slice(self, slobj: slice, axis: int = 0, kind=None) -> "Series":
-        slobj = self.index._convert_slice_indexer(slobj, kind=kind or "getitem")
+    def _slice(self, slobj: slice, axis: int = 0, kind: str = "getitem") -> "Series":
+        # kind is either "getitem" or "iloc"
+        slobj = self.index._convert_slice_indexer(slobj, kind=kind)
         return self._get_values(slobj)
 
     def __getitem__(self, key):