Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/pandas-dev/pandas into 26395
� Conflicts: �	pandas/tests/indexing/test_at.py
  • Loading branch information
phofl committed Nov 10, 2020
commit 1d332e8da57dc63223979a95c1231cf498b7e0c7
8 changes: 8 additions & 0 deletions pandas/tests/indexing/test_at.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ def test_at_frame_raises_key_error2(self):
with pytest.raises(KeyError, match="^0$"):
df.loc["a", 0]

def test_at_getitem_mixed_index_no_fallback(self):
# GH#19860
ser = Series([1, 2, 3, 4, 5], index=["a", "b", "c", 1, 2])
with pytest.raises(KeyError, match="^0$"):
ser.at[0]
with pytest.raises(KeyError, match="^4$"):
ser.at[4]


@pytest.mark.parametrize("func", ["at", "loc"])
def test_at_assign_float_to_int_frame(func):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.