Skip to content

Commit 46c2864

Browse files
jbrockmendelsimonjayhawkins
authored andcommitted
CLN: leftover ix checks (#30951)
1 parent 439d629 commit 46c2864

File tree

7 files changed

+28
-29
lines changed

7 files changed

+28
-29
lines changed

pandas/core/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class NDFrame(PandasObject, SelectionMixin, indexing.IndexingMixin):
177177
]
178178
_internal_names_set: Set[str] = set(_internal_names)
179179
_accessors: Set[str] = set()
180-
_deprecations: FrozenSet[str] = frozenset(["get_values", "ix"])
180+
_deprecations: FrozenSet[str] = frozenset(["get_values"])
181181
_metadata: List[str] = []
182182
_is_copy = None
183183
_data: BlockManager

pandas/core/indexes/base.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2829,24 +2829,24 @@ def _filter_indexer_tolerance(self, target, indexer, tolerance):
28292829
Parameters
28302830
----------
28312831
key : label of the slice bound
2832-
kind : {'ix', 'loc', 'getitem', 'iloc'} or None
2832+
kind : {'loc', 'getitem', 'iloc'} or None
28332833
"""
28342834

28352835
@Appender(_index_shared_docs["_convert_scalar_indexer"])
28362836
def _convert_scalar_indexer(self, key, kind=None):
2837-
assert kind in ["ix", "loc", "getitem", "iloc", None]
2837+
assert kind in ["loc", "getitem", "iloc", None]
28382838

28392839
if kind == "iloc":
28402840
return self._validate_indexer("positional", key, kind)
28412841

28422842
if len(self) and not isinstance(self, ABCMultiIndex):
28432843

28442844
# we can raise here if we are definitive that this
2845-
# is positional indexing (eg. .ix on with a float)
2845+
# is positional indexing (eg. .loc on with a float)
28462846
# or label indexing if we are using a type able
28472847
# to be represented in the index
28482848

2849-
if kind in ["getitem", "ix"] and is_float(key):
2849+
if kind in ["getitem"] and is_float(key):
28502850
if not self.is_floating():
28512851
return self._invalid_indexer("label", key)
28522852

@@ -2882,12 +2882,12 @@ def _convert_scalar_indexer(self, key, kind=None):
28822882
Parameters
28832883
----------
28842884
key : label of the slice bound
2885-
kind : {'ix', 'loc', 'getitem', 'iloc'} or None
2885+
kind : {'loc', 'getitem', 'iloc'} or None
28862886
"""
28872887

28882888
@Appender(_index_shared_docs["_convert_slice_indexer"])
28892889
def _convert_slice_indexer(self, key: slice, kind=None):
2890-
assert kind in ["ix", "loc", "getitem", "iloc", None]
2890+
assert kind in ["loc", "getitem", "iloc", None]
28912891

28922892
# validate iloc
28932893
if kind == "iloc":
@@ -3026,7 +3026,7 @@ def _convert_index_indexer(self, keyarr):
30263026
@Appender(_index_shared_docs["_convert_list_indexer"])
30273027
def _convert_list_indexer(self, keyarr, kind=None):
30283028
if (
3029-
kind in [None, "iloc", "ix"]
3029+
kind in [None, "iloc"]
30303030
and is_integer_dtype(keyarr)
30313031
and not self.is_floating()
30323032
and not isinstance(keyarr, ABCPeriodIndex)
@@ -4704,7 +4704,7 @@ def _validate_indexer(self, form, key, kind):
47044704
If we are positional indexer, validate that we have appropriate
47054705
typed bounds must be an integer.
47064706
"""
4707-
assert kind in ["ix", "loc", "getitem", "iloc"]
4707+
assert kind in ["loc", "getitem", "iloc"]
47084708

47094709
if key is None:
47104710
pass
@@ -4725,7 +4725,7 @@ def _validate_indexer(self, form, key, kind):
47254725
----------
47264726
label : object
47274727
side : {'left', 'right'}
4728-
kind : {'ix', 'loc', 'getitem'}
4728+
kind : {'loc', 'getitem'} or None
47294729
47304730
Returns
47314731
-------
@@ -4738,15 +4738,14 @@ def _validate_indexer(self, form, key, kind):
47384738

47394739
@Appender(_index_shared_docs["_maybe_cast_slice_bound"])
47404740
def _maybe_cast_slice_bound(self, label, side, kind):
4741-
assert kind in ["ix", "loc", "getitem", None]
4741+
assert kind in ["loc", "getitem", None]
47424742

47434743
# We are a plain index here (sub-class override this method if they
47444744
# wish to have special treatment for floats/ints, e.g. Float64Index and
47454745
# datetimelike Indexes
47464746
# reject them
47474747
if is_float(label):
4748-
if not (kind in ["ix"] and (self.holds_integer() or self.is_floating())):
4749-
self._invalid_indexer("slice", label)
4748+
self._invalid_indexer("slice", label)
47504749

47514750
# we are trying to find integer bounds on a non-integer based index
47524751
# this is rejected (generally .loc gets you here)
@@ -4780,14 +4779,14 @@ def get_slice_bound(self, label, side, kind):
47804779
----------
47814780
label : object
47824781
side : {'left', 'right'}
4783-
kind : {'ix', 'loc', 'getitem'}
4782+
kind : {'loc', 'getitem'} or None
47844783
47854784
Returns
47864785
-------
47874786
int
47884787
Index of label.
47894788
"""
4790-
assert kind in ["ix", "loc", "getitem", None]
4789+
assert kind in ["loc", "getitem", None]
47914790

47924791
if side not in ("left", "right"):
47934792
raise ValueError(
@@ -4847,7 +4846,7 @@ def slice_locs(self, start=None, end=None, step=None, kind=None):
48474846
If None, defaults to the end.
48484847
step : int, defaults None
48494848
If None, defaults to 1.
4850-
kind : {'ix', 'loc', 'getitem'} or None
4849+
kind : {'loc', 'getitem'} or None
48514850
48524851
Returns
48534852
-------

pandas/core/indexes/datetimelike.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,10 @@ def _convert_scalar_indexer(self, key, kind=None):
388388
Parameters
389389
----------
390390
key : label of the slice bound
391-
kind : {'ix', 'loc', 'getitem', 'iloc'} or None
391+
kind : {'loc', 'getitem', 'iloc'} or None
392392
"""
393393

394-
assert kind in ["ix", "loc", "getitem", "iloc", None]
394+
assert kind in ["loc", "getitem", "iloc", None]
395395

396396
# we don't allow integer/float indexing for loc
397397
# we don't allow float indexing for ix/getitem
@@ -400,7 +400,7 @@ def _convert_scalar_indexer(self, key, kind=None):
400400
is_flt = is_float(key)
401401
if kind in ["loc"] and (is_int or is_flt):
402402
self._invalid_indexer("index", key)
403-
elif kind in ["ix", "getitem"] and is_flt:
403+
elif kind in ["getitem"] and is_flt:
404404
self._invalid_indexer("index", key)
405405

406406
return super()._convert_scalar_indexer(key, kind=kind)

pandas/core/indexes/datetimes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
742742
----------
743743
label : object
744744
side : {'left', 'right'}
745-
kind : {'ix', 'loc', 'getitem'}
745+
kind : {'loc', 'getitem'} or None
746746
747747
Returns
748748
-------
@@ -752,7 +752,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
752752
-----
753753
Value of `side` parameter should be validated in caller.
754754
"""
755-
assert kind in ["ix", "loc", "getitem", None]
755+
assert kind in ["loc", "getitem", None]
756756

757757
if is_float(label) or isinstance(label, time) or is_integer(label):
758758
self._invalid_indexer("slice", label)

pandas/core/indexes/numeric.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def _validate_dtype(cls, dtype: Dtype) -> None:
9999

100100
@Appender(_index_shared_docs["_maybe_cast_slice_bound"])
101101
def _maybe_cast_slice_bound(self, label, side, kind):
102-
assert kind in ["ix", "loc", "getitem", None]
102+
assert kind in ["loc", "getitem", None]
103103

104104
# we will try to coerce to integers
105105
return self._maybe_cast_indexer(label)
@@ -260,7 +260,7 @@ def asi8(self) -> np.ndarray:
260260

261261
@Appender(_index_shared_docs["_convert_scalar_indexer"])
262262
def _convert_scalar_indexer(self, key, kind=None):
263-
assert kind in ["ix", "loc", "getitem", "iloc", None]
263+
assert kind in ["loc", "getitem", "iloc", None]
264264

265265
# don't coerce ilocs to integers
266266
if kind != "iloc":
@@ -317,7 +317,7 @@ def asi8(self) -> np.ndarray:
317317

318318
@Appender(_index_shared_docs["_convert_scalar_indexer"])
319319
def _convert_scalar_indexer(self, key, kind=None):
320-
assert kind in ["ix", "loc", "getitem", "iloc", None]
320+
assert kind in ["loc", "getitem", "iloc", None]
321321

322322
# don't coerce ilocs to integers
323323
if kind != "iloc":
@@ -404,7 +404,7 @@ def astype(self, dtype, copy=True):
404404

405405
@Appender(_index_shared_docs["_convert_scalar_indexer"])
406406
def _convert_scalar_indexer(self, key, kind=None):
407-
assert kind in ["ix", "loc", "getitem", "iloc", None]
407+
assert kind in ["loc", "getitem", "iloc", None]
408408

409409
if kind == "iloc":
410410
return self._validate_indexer("positional", key, kind)

pandas/core/indexes/period.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
625625
----------
626626
label : object
627627
side : {'left', 'right'}
628-
kind : {'ix', 'loc', 'getitem'}
628+
kind : {'loc', 'getitem'}
629629
630630
Returns
631631
-------
@@ -636,7 +636,7 @@ def _maybe_cast_slice_bound(self, label, side, kind):
636636
Value of `side` parameter should be validated in caller.
637637
638638
"""
639-
assert kind in ["ix", "loc", "getitem"]
639+
assert kind in ["loc", "getitem"]
640640

641641
if isinstance(label, datetime):
642642
return Period(label, freq=self.freq)

pandas/core/indexes/timedeltas.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,13 @@ def _maybe_cast_slice_bound(self, label, side, kind):
310310
----------
311311
label : object
312312
side : {'left', 'right'}
313-
kind : {'ix', 'loc', 'getitem'}
313+
kind : {'loc', 'getitem'} or None
314314
315315
Returns
316316
-------
317317
label : object
318318
"""
319-
assert kind in ["ix", "loc", "getitem", None]
319+
assert kind in ["loc", "getitem", None]
320320

321321
if isinstance(label, str):
322322
parsed = Timedelta(label)

0 commit comments

Comments
 (0)