-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
Fix no raise dup index when using drop with axis=0 #19230
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.
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
Changes from 9 commits
d0b39ea
f43dbf8
a4618bf
b49f78d
43fe5b0
7ceafa1
5f7e6a2
6c7bcf2
fa4c9fe
adf2283
c02c400
85e0094
556f959
5776bf3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3767,8 +3767,8 @@ def drop(self, labels, errors='raise'): | |
mask = indexer == -1 | ||
if mask.any(): | ||
if errors != 'ignore': | ||
raise ValueError('labels %s not contained in axis' % | ||
labels[mask]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. need to update the doc-strings for all (Index,Series,DataFrame,Panel) for drop to change ValueError -> KeyError in the Raises section (or add it if its not there) |
||
raise KeyError( | ||
'labels %s not contained in axis' % labels[mask]) | ||
indexer = indexer[~mask] | ||
return self.delete(indexer) | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,8 +41,8 @@ def test_drop_names(self): | |
assert obj.columns.name == 'second' | ||
assert list(df.columns) == ['d', 'e', 'f'] | ||
|
||
pytest.raises(ValueError, df.drop, ['g']) | ||
pytest.raises(ValueError, df.drop, ['g'], 1) | ||
pytest.raises(KeyError, df.drop, ['g']) | ||
pytest.raises(KeyError, df.drop, ['g'], 1) | ||
|
||
# errors = 'ignore' | ||
dropped = df.drop(['g'], errors='ignore') | ||
|
@@ -87,10 +87,10 @@ def test_drop(self): | |
assert_frame_equal(simple.drop( | ||
[0, 3], axis='index'), simple.loc[[1, 2], :]) | ||
|
||
pytest.raises(ValueError, simple.drop, 5) | ||
pytest.raises(ValueError, simple.drop, 'C', 1) | ||
pytest.raises(ValueError, simple.drop, [1, 5]) | ||
pytest.raises(ValueError, simple.drop, ['A', 'C'], 1) | ||
pytest.raises(KeyError, simple.drop, 5) | ||
pytest.raises(KeyError, simple.drop, 'C', 1) | ||
pytest.raises(KeyError, simple.drop, [1, 5]) | ||
pytest.raises(KeyError, simple.drop, ['A', 'C'], 1) | ||
|
||
# errors = 'ignore' | ||
assert_frame_equal(simple.drop(5, errors='ignore'), simple) | ||
|
@@ -1128,3 +1128,25 @@ def test_reindex_multi(self): | |
expected = df.reindex([0, 1]).reindex(columns=['a', 'b']) | ||
|
||
assert_frame_equal(result, expected) | ||
|
||
data = [[1, 2, 3], [1, 2, 3]] | ||
|
||
@pytest.mark.parametrize('actual', [ | ||
DataFrame(data=data, index=['a', 'a']), | ||
DataFrame(data=data, index=['a', 'b']), | ||
DataFrame(data=data, index=['a', 'b']).set_index([0, 1]), | ||
DataFrame(data=data, index=['a', 'a']).set_index([0, 1]) | ||
]) | ||
def test_raise_on_drop_duplicate_index(self, actual): | ||
|
||
# issue 19186 | ||
level = 0 if isinstance(actual.index, MultiIndex) else None | ||
with pytest.raises(KeyError): | ||
actual.drop('c', level=level, axis=0) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Split this into multiple |
||
actual.T.drop('c', level=level, axis=1) | ||
expected_no_err = actual.drop('c', axis=0, level=level, | ||
errors='ignore') | ||
assert_frame_equal(expected_no_err, actual) | ||
expected_no_err = actual.T.drop('c', axis=1, level=level, | ||
errors='ignore') | ||
assert_frame_equal(expected_no_err.T, actual) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add another entry in API breaking saysing that
.drop()
forSeries,Index,DataFrame,Panel .drop
now raisesKeyError
rather thanValueError
if labels are missing (use this PR number)