Skip to content

TST/CLN: Follow-up to #31867 #32324

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 2 commits into from
Feb 29, 2020
Merged

TST/CLN: Follow-up to #31867 #32324

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf45b2
TST/CLN: Follow-up to #31867
simonjayhawkins Feb 28, 2020
05eff1e
test_scalar_non_numeric
simonjayhawkins Feb 28, 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
55 changes: 11 additions & 44 deletions pandas/tests/indexing/test_floats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,43 +95,14 @@ def test_scalar_non_numeric(self, index_func, klass):
s = gen_obj(klass, i)

# getting
for idxr, getitem in [(lambda x: x.iloc, False), (lambda x: x, True)]:
with pytest.raises(KeyError, match="^3.0$"):
s[3.0]

if getitem:
error = KeyError
msg = r"^3\.0?$"
else:
error = TypeError
msg = (
r"cannot do (label|positional) indexing "
fr"on {type(i).__name__} with these indexers \[3\.0\] of "
r"type float|"
"Cannot index by location index with a "
"non-integer key"
)
with pytest.raises(error, match=msg):
idxr(s)[3.0]

# label based can be a TypeError or KeyError
if s.index.inferred_type in {
"categorical",
"string",
"unicode",
"mixed",
"period",
"timedelta64",
"datetime64",
}:
error = KeyError
msg = r"^3\.0$"
else:
error = TypeError
msg = (
r"cannot do (label|positional) indexing "
fr"on {type(i).__name__} with these indexers \[3\.0\] of "
"type float"
)
with pytest.raises(error, match=msg):
msg = "Cannot index by location index with a non-integer key"
with pytest.raises(TypeError, match=msg):
s.iloc[3.0]

with pytest.raises(KeyError, match="^3.0$"):
s.loc[3.0]

# contains
Expand Down Expand Up @@ -190,16 +161,12 @@ def test_scalar_with_mixed(self):
s2 = Series([1, 2, 3], index=["a", "b", "c"])
s3 = Series([1, 2, 3], index=["a", "b", 1.5])

# lookup in a pure stringstr
# with an invalid indexer
msg = (
r"cannot do label indexing "
r"on Index with these indexers \[1\.0\] of "
r"type float|"
"Cannot index by location index with a non-integer key"
)
# lookup in a pure string index with an invalid indexer

with pytest.raises(KeyError, match="^1.0$"):
s2[1.0]

msg = "Cannot index by location index with a non-integer key"
with pytest.raises(TypeError, match=msg):
s2.iloc[1.0]

Expand Down