CLN: Catch more specific exception in groupby.ops #28198
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -212,9 +212,12 @@ def apply(self, f, data, axis=0): | |
| # This Exception is also raised if `f` triggers an exception | ||
| # but it is preferable to raise the exception in Python. | ||
| pass | ||
| except TypeError as err: | ||
| if "Cannot convert" in str(err): | ||
| # via apply_frame_axis0 if we pass a non-ndarray | ||
| pass | ||
|
There was a problem hiding this comment. looks fine, does this change any perf? IOW this looks like this is now taking a path that previously we raised (and then likely did an .apply on) There was a problem hiding this comment. Not sure. Between this, #27909, and a not-yet-pushed branch that fixes incorrect exception handling in cython_agg_block, I'm pretty sure we'll end up falling back to python-space less often, but it isn't obvious what the individual changes affect perf-wise. |
||
| else: | ||
| raise | ||
|
|
||
| for key, (i, group) in zip(group_keys, splitter): | ||
| object.__setattr__(group, "name", key) | ||
|
|
||
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.
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.
Is the type(s) of exceptions that raise this not well defined?
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.
cython raises this (with a message matching this pattern) if we pass a non-ndarray to something expected an ndarray. im not aware of any other cases we actually want to let pass here
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.
I assume you saw other non-Cython TypeErrors show up here then?
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.
if we dont catch TypeError at all, the only tests that fail are ones where apply_frame_axis0 is raising because it expects an ndarray
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.
I may have asked this wrong but I don't think we are on the same page. So I was thinking to keep catching
TypeErrorbut was questioning if we need the conditional block therein, as it diverges slightly from the pre-existing behavior.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.
Changing the behavior is intentional. ATM we are
passing on everything, and I want topasson a narrow set ofTypeErrors.