unify 3.12 / non-3.12 error handling branches #3472
Merged
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
davidhewitt
force-pushed
the
normalized-exceptions-3
branch
from
6b65c6f
to
d089c92
Compare
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.
Split out further from #3471
This PR merges the 3.12 and non-3.12 implementations of
PyErrState::normalizeinto a single implementation with cfgs on the match arm. Where it made sense there were surrounding refactorings to make thenormalizeandrestoreimplementations share code and read cleanly.As this doesn't have any changes in behaviour and removes clutter from the other error handling PRs, I will proceed to merge this as soon as it's green.