Skip to content

Commit 618f479

Browse files
committed
Add test for wrong category type
1 parent dad92a2 commit 618f479

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

pandas/core/indexes/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,11 +2953,11 @@ def _convert_scalar_indexer(self, key, kind=None):
29532953
"unicode",
29542954
"mixed",
29552955
]:
2956-
return self._invalid_indexer("label", key)
2956+
self._invalid_indexer("label", key)
29572957

29582958
elif kind in ["loc"] and is_integer(key):
29592959
if not self.holds_integer():
2960-
return self._invalid_indexer("label", key)
2960+
self._invalid_indexer("label", key)
29612961

29622962
return key
29632963

pandas/core/indexes/category.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,8 +700,7 @@ def _convert_scalar_indexer(self, key, kind=None):
700700
try:
701701
return self.categories._convert_scalar_indexer(key, kind=kind)
702702
except TypeError:
703-
self._invalid_indexer("label", key=key)
704-
703+
self._invalid_indexer("label", key)
705704
return super()._convert_scalar_indexer(key, kind=kind)
706705

707706
@Appender(_index_shared_docs["_convert_list_indexer"])

pandas/tests/indexing/test_categorical.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ def test_loc_scalar(self):
8080
with pytest.raises(TypeError, match=msg):
8181
df.loc["d", "C"] = 10
8282

83+
msg = (
84+
r"cannot do label indexing on <class 'pandas\.core\.indexes\.category"
85+
r"\.CategoricalIndex'> with these indexers \[1\] of <class 'int'>"
86+
)
87+
with pytest.raises(TypeError, match=msg):
88+
df.loc[1]
89+
8390
def test_getitem_scalar(self):
8491

8592
cats = Categorical([Timestamp("12-31-1999"), Timestamp("12-31-2000")])

0 commit comments

Comments
 (0)