REF: avoid try/except in Block.where #37802
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
requested changes
Nov 13, 2020
pandas/core/internals/blocks.py
Outdated
| try: | ||
| result = where_func(cond, values, other) | ||
| except TypeError: | ||
| if self.is_bool and lib.is_float(other) and np.isnan(other): |
There was a problem hiding this comment.
prob can lif this to one higher level (and the elif below)
There was a problem hiding this comment.
i think that would take some gymnastics to avoid having the L1455-1456 cases fall through to the expressions.where call
pandas/core/internals/blocks.py
Outdated
| try: | ||
| result = where_func(cond, values, other) | ||
| except TypeError: | ||
| if self.is_bool and lib.is_float(other) and np.isnan(other): |
There was a problem hiding this comment.
does this include self.integer (e.g. the same case you have on L1474)
There was a problem hiding this comment.
changing the self.is_bool to (self.is_integer or self.is_bool) here doesn't break any tests, and i guess going through expressions may be more performant (though im not wild about the casting being not-super-obvious). will update.
jreback
added
Internals
jreback
approved these changes
Nov 13, 2020
|
thanks, some comments for followon |
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.
No description provided.