Preserve panic message after exception is normalized #3326
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
src/err/mod.rs
Outdated
| @@ -299,7 +299,7 @@ impl PyErr { | |||
| if ptype.as_ptr() == PanicException::type_object_raw(py).cast() { | |||
| let msg: String = pvalue | |||
| .as_ref() | |||
| .and_then(|obj| obj.extract(py).ok()) | |||
| .map(|obj| obj.as_ref(py).to_string()) | |||
There was a problem hiding this comment.
IIRC, we changed the Display impl to call into write_unraisable if the call to PyAny::str fails. Is this appropriate here? Should we call and_then(|obj| obj.as_ref(py).str().ok()) instead since we have an alternative fallback here?
davidhewitt
force-pushed
the
fix-err-panic-normalize
branch
from
a3afe9d to
2e2dde9
Compare
adamreichold
approved these changes
Jul 19, 2023
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 off from #3306
This was a bug I noticed on pre-3.12 Pythons where the panic message would not be extracted correctly if the
PanicExceptionhad been normalised. After being fetched by PyO3 thePanicExceptionwould have its message reset to "Unwrapped panic from Python code".