Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

handle cause and context with same code block

Browse Source
This commit is contained in:
Jeong YunWon
2021-08-10 04:04:22 +09:00
committed by Jeong YunWon
parent 83914a9f54
commit a611ba2e45
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
vm/src/exceptions.rs
View File

@@ -251,32 +251,33 @@ fn write_exception_recursive<W: Write>(
// use `wite_exception` as a public interface.
// It is similar to `print_exception_recursive` from `CPython`.
seen.insert(exc.as_object().get_id());
if let Some(cause) = exc.cause() {
#[allow(clippy::manual_map)]
if let Some((cause_or_context, msg)) = if let Some(cause) = exc.cause() {
// This can be a special case: `raise e from e`,
// we just ignore it and treat like `raise e` without any extra steps.
if !seen.contains(&cause.as_object().get_id()) {
write_exception_recursive(output, vm, &cause, seen)?;
writeln!(
output,
"\nThe above exception was the direct cause of the following exception:\n"
)?;
} else {
seen.insert(cause.as_object().get_id());
}
Some((
cause,
"\nThe above exception was the direct cause of the following exception:\n",
))
} else if let Some(context) = exc.context() {
// This can be a special case:
// e = ValueError('e')
// e.__context__ = e
// In this case, we just ignore
// `__context__` part from going into recursion.
if !seen.contains(&context.as_object().get_id()) {
write_exception_recursive(output, vm, &context, seen)?;
writeln!(
output,
"\nDuring handling of the above exception, another exception occurred:\n"
)?;
Some((
context,
"\nDuring handling of the above exception, another exception occurred:\n",
))
} else {
None
} {
if !seen.contains(&cause_or_context.as_object().get_id()) {
write_exception_recursive(output, vm, &cause_or_context, seen)?;
writeln!(output, "{}", msg)?;
} else {
seen.insert(context.as_object().get_id());
seen.insert(cause_or_context.as_object().get_id());
}
}