Add traceback constructor

coolreader18 · coolreader18 · commit 84003d6e81b0 · 2025-04-07T11:17:39.000-05:00
diff --git a/Lib/test/test_raise.py b/Lib/test/test_raise.py
@@ -270,8 +270,6 @@ def test_attrs(self):
         tb.tb_next = new_tb
         self.assertIs(tb.tb_next, new_tb)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_constructor(self):
         other_tb = get_tb()
         frame = sys._getframe()
diff --git a/vm/src/builtins/traceback.rs b/vm/src/builtins/traceback.rs
@@ -1,6 +1,10 @@
 use rustpython_common::lock::PyMutex;
 
+use crate::types::Constructor;
 use crate::{Context, PyRef, class::PyClassImpl, frame::FrameRef, source::LineNumber};
+use crate::{PyPayload, PyResult, VirtualMachine};
+
+use super::PyTypeRef;
 
 #[pyclass(module = false, name = "traceback", traverse, ctx = traceback_type)]
 #[derive(Debug)]
@@ -15,7 +19,26 @@ pub struct PyTraceback {
 
 pub type PyTracebackRef = PyRef<PyTraceback>;
 
-#[pyclass]
+impl Constructor for PyTraceback {
+    type Args = (Option<PyRef<Self>>, FrameRef, u32, usize);
+
+    fn py_new(
+        cls: PyTypeRef,
+        (next, frame, lasti, lineno): Self::Args,
+        vm: &VirtualMachine,
+    ) -> PyResult {
+        Self::new(
+            next,
+            frame,
+            lasti,
+            LineNumber::new(lineno).unwrap_or(LineNumber::MIN),
+        )
+        .into_ref_with_type(vm, cls)
+        .map(Into::into)
+    }
+}
+
+#[pyclass(with(Constructor))]
 impl PyTraceback {
     pub fn new(next: Option<PyRef<Self>>, frame: FrameRef, lasti: u32, lineno: LineNumber) -> Self {
         PyTraceback {
@@ -42,19 +65,19 @@ impl PyTraceback {
     }
 
     #[pygetset]
-    fn tb_next(&self) -> Option<PyRef<Self>> {
-        self.next.lock().as_ref().cloned()
+    pub fn tb_next(&self) -> Option<PyRef<Self>> {
+        self.next.lock().clone()
     }
 
     #[pygetset(setter)]
-    fn set_tb_next(&self, value: Option<PyRef<Self>>) {
+    pub fn set_tb_next(&self, value: Option<PyRef<Self>>) {
         *self.next.lock() = value;
     }
 }
 
 impl PyTracebackRef {
     pub fn iter(&self) -> impl Iterator<Item = PyTracebackRef> {
-        std::iter::successors(Some(self.clone()), |tb| tb.next.lock().clone())
+        std::iter::successors(Some(self.clone()), |tb| tb.tb_next())
     }
 }
 
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -176,7 +176,7 @@ fn remove_importlib_frames_inner(
     let file_name = traceback.frame.code.source_path.as_str();
 
     let (inner_tb, mut now_in_importlib) =
-        remove_importlib_frames_inner(vm, traceback.next.lock().clone(), always_trim);
+        remove_importlib_frames_inner(vm, traceback.tb_next(), always_trim);
     if file_name == "_frozen_importlib" || file_name == "_frozen_importlib_external" {
         if traceback.frame.code.obj_name.as_str() == "_call_with_frames_removed" {
             now_in_importlib = true;
