maybe_upcast_putmask: require other to be a scalar #29332
Merged
Conversation
This file contains hidden or 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
jreback
approved these changes
Nov 2, 2019
| @@ -232,7 +232,7 @@ def trans(x): | |||
| return result | |||
|
|
|||
|
|
|||
| def maybe_upcast_putmask(result, mask, other): | |||
| def maybe_upcast_putmask(result: np.ndarray, mask: np.ndarray, other): | |||
There was a problem hiding this comment.
looks like ill be doing a branch of just follow-ups soon
Reksbril
pushed a commit
to Reksbril/pandas
that referenced
this pull request
Nov 18, 2019
proost
pushed a commit
to proost/pandas
that referenced
this pull request
Dec 19, 2019
proost
pushed a commit
to proost/pandas
that referenced
this pull request
Dec 19, 2019
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.
ATM all places where we use
maybe_upcast_putmaskhaveotheras a scalar. By making that into a requirement for the function, we can rule out the possibility of passing non-scalar other intomaybe_promote(xref #29331).Note: there are some simplifications within maybe_upcast_putmask that this makes possible that I did not implement in this PR.
cc @jreback @h-vetinari