Skip to content

Improve exceptions and traceback #5622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
arihant2math wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Improve exceptions and traceback #5622

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
40a6958
limit and repeat trucation for traceback
arihant2math Mar 25, 2025
a3c76ac
fix compile
arihant2math Mar 25, 2025
43648cf
rewrite exception groups in rust
arihant2math Mar 31, 2025
57110a5
fix compile errors
arihant2math Mar 31, 2025
59505bc
fix compile
arihant2math Mar 31, 2025
10e9c3f
formatting
arihant2math Mar 31, 2025
80c1aac
fix clippy allow
arihant2math Apr 6, 2025
ce7a890
make spell check happy
arihant2math Apr 6, 2025
7f0d4fa
remove old python initialization code
arihant2math Apr 6, 2025
552ea15
exception group impl
arihant2math Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix compile errors
  • Loading branch information
@arihant2math
arihant2math committed Apr 6, 2025
commit 57110a513391c1d7a7291dc2dc77983e03fb5e09
51 changes: 21 additions & 30 deletions vm/src/exceptions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ pub(super) mod types {
function::{ArgBytesLike, FuncArgs},
types::{Constructor, Initializer},
};
use crate::{PyPayload, builtins::PyListRef, class::StaticType, common::lock::PyRwLock};
use crate::{builtins::PyListRef, common::lock::PyRwLock, convert::IntoObject, PyPayload};
use crossbeam_utils::atomic::AtomicCell;
use itertools::Itertools;
use rustpython_common::str::UnicodeEscapeCodepoint;
Expand Down Expand Up @@ -1255,7 +1255,7 @@ pub(super) mod types {
impl PyBaseExceptionGroup {
#[pyslot]
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
let (message, exceptions) = args.bind(vm)?;
let (message, exceptions): (PyStrRef, PyObjectRef) = args.bind(vm)?;
let exceptions = exceptions.to_sequence();
let len = exceptions.length(vm)?;
if len == 0 {
Expand All @@ -1264,7 +1264,7 @@ pub(super) mod types {
));
}
for i in 0..len {
let item = exceptions.get_item(i, vm)?;
let item = exceptions.get_item(i as isize, vm)?;
if !item.is_instance(PyBaseException::class(&vm.ctx).into(), vm)? {
return Err(vm.new_value_error(format!(
"Item {i} of second argument (exceptions) is not an exception"
Expand All @@ -1275,8 +1275,8 @@ pub(super) mod types {
let is_subclass = !(cls.is(PyBaseExceptionGroup::class(&vm.ctx))
|| cls.is(PyExceptionGroup::class(&vm.ctx)));
for i in 0..len {
let item = exceptions.get_item(i, vm)?;
if item.is_instance(PyBaseExceptionGroup::class(&vm.ctx), vm)? {
let item = exceptions.get_item(i as isize, vm)?;
if item.is_instance(PyBaseExceptionGroup::class(&vm.ctx).into(), vm)? {
if is_subclass {
return Err(vm.new_type_error(format!(
"Cannot nest BaseExceptions in {}",
Expand All @@ -1291,13 +1291,13 @@ pub(super) mod types {
}
let mut exceptions_vec = Vec::with_capacity(len);
for i in 0..len {
let item = exceptions.get_item(i, vm)?;
let item = exceptions.get_item(i as isize, vm)?;
exceptions_vec.push(item.clone());
}
let args = Vec::with_capacity(1 + len);
let mut args = Vec::with_capacity(1 + len);
args.push(message.clone().into_object());
for i in 0..len {
let item = exceptions.get_item(i, vm)?;
let item = exceptions.get_item(i as isize, vm)?;
args.push(item.clone());
}
Ok(PyBaseExceptionGroup {
Expand All @@ -1310,45 +1310,38 @@ pub(super) mod types {
exceptions: PyRwLock::new(exceptions_vec),
notes: PyRwLock::new(None),
}
.into_pyobject(vm)?)
.into_pyobject(vm))
}

#[pygetset]
fn message(&self, vm: &VirtualMachine) -> PyStrRef {
fn message(&self) -> PyStrRef {
self.message
.read()
.as_ref()
.map_or_else(|| vm.ctx.new_str("".to_owned()), |x| x.clone())
.clone()
}
#[pygetset]
fn exceptions(&self, vm: &VirtualMachine) -> PyTupleRef {
self.exceptions
.read()
.as_ref()
.map_or_else(|| vm.ctx.new_tuple(vec![]), |x| x.clone())
let exceptions = self.exceptions
.read();
vm.ctx.new_tuple(exceptions.clone())
}

#[pymethod]
fn add_note(&self, note: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
if !note.is_instance(PyStrRef::class(&vm.ctx), vm)? {
return Err(vm.new_type_error("add_note() argument must be a string".to_owned()));
}
fn add_note(&self, note: PyStrRef, vm: &VirtualMachine) -> PyResult<()> {
let mut notes = self.notes.write();
if notes.is_none() {
*notes = Some(vm.ctx.new_list(vec![]));
}
notes.as_mut().unwrap().append(note);
notes.as_mut().unwrap().append(note.into());
Ok(())
}

#[pymethod(magic)]
fn str(&self, vm: &VirtualMachine) -> PyStrRef {
let msg = self
.message
.read()
.as_ref()
.map_or_else(|| vm.ctx.new_str("".to_owned()), |x| x.clone());
let num_excs = self.exceptions.read().as_ref().map_or(0, |x| x.len());
.read();
let num_excs = self.exceptions.read().len();
let s = format!(
"{msg} ({num_excs} sub-exception{p})",
p = if num_excs == 1 { "" } else { "s" }
Expand All @@ -1360,12 +1353,10 @@ pub(super) mod types {
fn repr(&self, vm: &VirtualMachine) -> PyStrRef {
let msg = self
.message
.read()
.as_ref()
.map_or_else(|| vm.ctx.new_str("".to_owned()), |x| x.clone());
let num_excs = self.exceptions.read().as_ref().map_or(0, |x| x.len());
.read();
let num_excs = self.exceptions.read().len();
// TODO: repr of message
let s = format!("{}({msg}, {num_excs})", self.class().name());
let s = format!("{}({msg}, {num_excs})", Self::class(&vm.ctx).name());
vm.ctx.new_str(s)
}
}
Expand Down