Fix regression for setitem not aligning rhs with boolean indexer #39944
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phofl
added
Indexing
jreback
requested changes
Feb 21, 2021
| @@ -3263,6 +3263,8 @@ def _setitem_array(self, key, value): | |||
| key = check_bool_indexer(self.index, key) | |||
| indexer = key.nonzero()[0] | |||
| self._check_setitem_copy() | |||
| if isinstance(value, DataFrame): | |||
There was a problem hiding this comment.
does series hit this path?
There was a problem hiding this comment.
No, I did this because value could be an array for example
| @@ -566,3 +566,11 @@ def test_setitem_boolean_mask(self, mask_type, float_frame): | |||
| expected = df.copy() | |||
| expected.values[np.array(mask)] = np.nan | |||
| tm.assert_frame_equal(result, expected) | |||
|
|
|||
| def test_setitem_boolean_mask_aligning(self): | |||
There was a problem hiding this comment.
can you parameterize over .loc & setitem
maybe add words to that effect as a comment in the code test failure unreleated. restarted job |
� Conflicts: � doc/source/whatsnew/v1.2.3.rst
|
Added something |
pandas/core/frame.py
Outdated
| @@ -3264,6 +3264,9 @@ def _setitem_array(self, key, value): | |||
| key = check_bool_indexer(self.index, key) | |||
| indexer = key.nonzero()[0] | |||
| self._check_setitem_copy() | |||
| if isinstance(value, DataFrame): | |||
| # GHä39931 reindex since iloc does not align | |||
There was a problem hiding this comment.
otherwise LGTM. Thanks @phofl
jreback
approved these changes
Feb 22, 2021
|
thanks @phofl |
|
@meeseeksdev backport 1.2.x |
meeseeksmachine
pushed a commit
to meeseeksmachine/pandas
that referenced
this pull request
Feb 22, 2021
… rhs with boolean indexer
simonjayhawkins
pushed a commit
that referenced
this pull request
Feb 23, 2021
…igning rhs with boolean indexer) (#39979) Co-authored-by: patrick <61934744+phofl@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
reindexing solves the issue here before dispatching to iloc