CLN: leftover ix checks (#30951)

Author: jbrockmendel

pandas/core/generic.py

@@ -177,7 +177,7 @@ class NDFrame(PandasObject, SelectionMixin, indexing.IndexingMixin):
  ]
  _internal_names_set: Set[str] = set(_internal_names)
  _accessors: Set[str] = set()
- _deprecations: FrozenSet[str] = frozenset(["get_values", "ix"])
+ _deprecations: FrozenSet[str] = frozenset(["get_values"])
  _metadata: List[str] = []
  _is_copy = None
  _data: BlockManager

pandas/core/indexes/base.py

@@ -2829,24 +2829,24 @@ def _filter_indexer_tolerance(self, target, indexer, tolerance):
  Parameters
  ----------
  key : label of the slice bound
- kind : {'ix', 'loc', 'getitem', 'iloc'} or None
+ kind : {'loc', 'getitem', 'iloc'} or None
  """
 
  @Appender(_index_shared_docs["_convert_scalar_indexer"])
  def _convert_scalar_indexer(self, key, kind=None):
- assert kind in ["ix", "loc", "getitem", "iloc", None]
+ assert kind in ["loc", "getitem", "iloc", None]
 
  if kind == "iloc":
  return self._validate_indexer("positional", key, kind)
 
  if len(self) and not isinstance(self, ABCMultiIndex):
 
  # we can raise here if we are definitive that this
- # is positional indexing (eg. .ix on with a float)
+ # is positional indexing (eg. .loc on with a float)
  # or label indexing if we are using a type able
  # to be represented in the index
 
- if kind in ["getitem", "ix"] and is_float(key):
+ if kind in ["getitem"] and is_float(key):
  if not self.is_floating():
  return self._invalid_indexer("label", key)
 
@@ -2882,12 +2882,12 @@ def _convert_scalar_indexer(self, key, kind=None):
  Parameters
  ----------
  key : label of the slice bound
- kind : {'ix', 'loc', 'getitem', 'iloc'} or None
+ kind : {'loc', 'getitem', 'iloc'} or None
  """
 
  @Appender(_index_shared_docs["_convert_slice_indexer"])
  def _convert_slice_indexer(self, key: slice, kind=None):
- assert kind in ["ix", "loc", "getitem", "iloc", None]
+ assert kind in ["loc", "getitem", "iloc", None]
 
  # validate iloc
  if kind == "iloc":
@@ -3026,7 +3026,7 @@ def _convert_index_indexer(self, keyarr):
  @Appender(_index_shared_docs["_convert_list_indexer"])
  def _convert_list_indexer(self, keyarr, kind=None):
  if (
- kind in [None, "iloc", "ix"]
+ kind in [None, "iloc"]
  and is_integer_dtype(keyarr)
  and not self.is_floating()
  and not isinstance(keyarr, ABCPeriodIndex)
@@ -4704,7 +4704,7 @@ def _validate_indexer(self, form, key, kind):
  If we are positional indexer, validate that we have appropriate
  typed bounds must be an integer.
  """
- assert kind in ["ix", "loc", "getitem", "iloc"]
+ assert kind in ["loc", "getitem", "iloc"]
 
  if key is None:
  pass
@@ -4725,7 +4725,7 @@ def _validate_indexer(self, form, key, kind):
  ----------
  label : object
  side : {'left', 'right'}
- kind : {'ix', 'loc', 'getitem'}
+ kind : {'loc', 'getitem'} or None
 
  Returns
  -------
@@ -4738,15 +4738,14 @@ def _validate_indexer(self, form, key, kind):
 
  @Appender(_index_shared_docs["_maybe_cast_slice_bound"])
  def _maybe_cast_slice_bound(self, label, side, kind):
- assert kind in ["ix", "loc", "getitem", None]
+ assert kind in ["loc", "getitem", None]
 
  # We are a plain index here (sub-class override this method if they
  # wish to have special treatment for floats/ints, e.g. Float64Index and
  # datetimelike Indexes
  # reject them
  if is_float(label):
- if not (kind in ["ix"] and (self.holds_integer() or self.is_floating())):
- self._invalid_indexer("slice", label)
+ self._invalid_indexer("slice", label)
 
  # we are trying to find integer bounds on a non-integer based index
  # this is rejected (generally .loc gets you here)
@@ -4780,14 +4779,14 @@ def get_slice_bound(self, label, side, kind):
  ----------
  label : object
  side : {'left', 'right'}
- kind : {'ix', 'loc', 'getitem'}
+ kind : {'loc', 'getitem'} or None
 
  Returns
  -------
  int
  Index of label.
  """
- assert kind in ["ix", "loc", "getitem", None]
+ assert kind in ["loc", "getitem", None]
 
  if side not in ("left", "right"):
  raise ValueError(
@@ -4847,7 +4846,7 @@ def slice_locs(self, start=None, end=None, step=None, kind=None):
  If None, defaults to the end.
  step : int, defaults None
  If None, defaults to 1.
- kind : {'ix', 'loc', 'getitem'} or None
+ kind : {'loc', 'getitem'} or None
 
  Returns
  -------

pandas/core/indexes/datetimelike.py

@@ -388,10 +388,10 @@ def _convert_scalar_indexer(self, key, kind=None):
  Parameters
  ----------
  key : label of the slice bound
- kind : {'ix', 'loc', 'getitem', 'iloc'} or None
+ kind : {'loc', 'getitem', 'iloc'} or None
  """
 
- assert kind in ["ix", "loc", "getitem", "iloc", None]
+ assert kind in ["loc", "getitem", "iloc", None]
 
  # we don't allow integer/float indexing for loc
  # we don't allow float indexing for ix/getitem
@@ -400,7 +400,7 @@ def _convert_scalar_indexer(self, key, kind=None):
  is_flt = is_float(key)
  if kind in ["loc"] and (is_int or is_flt):
  self._invalid_indexer("index", key)
- elif kind in ["ix", "getitem"] and is_flt:
+ elif kind in ["getitem"] and is_flt:
  self._invalid_indexer("index", key)
 
  return super()._convert_scalar_indexer(key, kind=kind)

pandas/core/indexes/datetimes.py

@@ -742,7 +742,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
  ----------
  label : object
  side : {'left', 'right'}
- kind : {'ix', 'loc', 'getitem'}
+ kind : {'loc', 'getitem'} or None
 
  Returns
  -------
@@ -752,7 +752,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
  -----
  Value of `side` parameter should be validated in caller.
  """
- assert kind in ["ix", "loc", "getitem", None]
+ assert kind in ["loc", "getitem", None]
 
  if is_float(label) or isinstance(label, time) or is_integer(label):
  self._invalid_indexer("slice", label)

pandas/core/indexes/numeric.py

@@ -99,7 +99,7 @@ def _validate_dtype(cls, dtype: Dtype) -> None:
 
  @Appender(_index_shared_docs["_maybe_cast_slice_bound"])
  def _maybe_cast_slice_bound(self, label, side, kind):
- assert kind in ["ix", "loc", "getitem", None]
+ assert kind in ["loc", "getitem", None]
 
  # we will try to coerce to integers
  return self._maybe_cast_indexer(label)
@@ -260,7 +260,7 @@ def asi8(self) -> np.ndarray:
 
  @Appender(_index_shared_docs["_convert_scalar_indexer"])
  def _convert_scalar_indexer(self, key, kind=None):
- assert kind in ["ix", "loc", "getitem", "iloc", None]
+ assert kind in ["loc", "getitem", "iloc", None]
 
  # don't coerce ilocs to integers
  if kind != "iloc":
@@ -317,7 +317,7 @@ def asi8(self) -> np.ndarray:
 
  @Appender(_index_shared_docs["_convert_scalar_indexer"])
  def _convert_scalar_indexer(self, key, kind=None):
- assert kind in ["ix", "loc", "getitem", "iloc", None]
+ assert kind in ["loc", "getitem", "iloc", None]
 
  # don't coerce ilocs to integers
  if kind != "iloc":
@@ -404,7 +404,7 @@ def astype(self, dtype, copy=True):
 
  @Appender(_index_shared_docs["_convert_scalar_indexer"])
  def _convert_scalar_indexer(self, key, kind=None):
- assert kind in ["ix", "loc", "getitem", "iloc", None]
+ assert kind in ["loc", "getitem", "iloc", None]
 
  if kind == "iloc":
  return self._validate_indexer("positional", key, kind)

pandas/core/indexes/period.py

@@ -625,7 +625,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
  ----------
  label : object
  side : {'left', 'right'}
- kind : {'ix', 'loc', 'getitem'}
+ kind : {'loc', 'getitem'}
 
  Returns
  -------
@@ -636,7 +636,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
  Value of `side` parameter should be validated in caller.
 
  """
- assert kind in ["ix", "loc", "getitem"]
+ assert kind in ["loc", "getitem"]
 
  if isinstance(label, datetime):
  return Period(label, freq=self.freq)

pandas/core/indexes/timedeltas.py

@@ -310,13 +310,13 @@ def _maybe_cast_slice_bound(self, label, side, kind):
  ----------
  label : object
  side : {'left', 'right'}
- kind : {'ix', 'loc', 'getitem'}
+ kind : {'loc', 'getitem'} or None
 
  Returns
  -------
  label : object
  """
- assert kind in ["ix", "loc", "getitem", None]
+ assert kind in ["loc", "getitem", None]
 
  if isinstance(label, str):
  parsed = Timedelta(label)