Skip to content

Fix traceback #6569

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

Merged
youknowone merged 6 commits into from
Dec 30, 2025
Merged

Fix traceback #6569

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3791e31
Fix traceback
youknowone Dec 29, 2025
b5838cc
Update traceback from CPython 3.13.11
youknowone Dec 28, 2025
aa600ab
unmark test_traceback
youknowone Dec 29, 2025
24dc19d
fix code
youknowone Dec 29, 2025
69fd874
fix debug range
youknowone Dec 30, 2025
4103350
fix tests
youknowone Dec 30, 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 code
  • Loading branch information
@youknowone
youknowone committed Dec 30, 2025
commit 24dc19dbefdf6a0c93e2f3f9ec3241c12ec29b4d
4 changes: 2 additions & 2 deletions Lib/test/test_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ def test_co_positions_artificial_instructions(self):
]
)

# TODO: RUSTPYTHON
# TODO: RUSTPYTHON; no_debug_ranges option not supported
@unittest.expectedFailure
def test_endline_and_columntable_none_when_no_debug_ranges(self):
# Make sure that if `-X no_debug_ranges` is used, there is
Expand All @@ -442,7 +442,7 @@ def f():
""")
assert_python_ok('-X', 'no_debug_ranges', '-c', code)

# TODO: RUSTPYTHON
# TODO: RUSTPYTHON; no_debug_ranges option not supported
@unittest.expectedFailure
def test_endline_and_columntable_none_when_no_debug_ranges_env(self):
# Same as above but using the environment variable opt out.
Expand Down
12 changes: 2 additions & 10 deletions crates/vm/src/builtins/code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,18 +809,10 @@ impl PyCode {
Some(line + end_line_delta)
};

// Convert Option to PyObject (None or int)
// If column == end_column, treat as if column info is not available
// This happens because RustPython's linetable doesn't store separate
// start/end column info
let (final_column, final_end_column) = match (column, end_column) {
(Some(c), Some(ec)) if c == ec => (None, None),
_ => (column, end_column),
};
let line_obj = final_line.to_pyobject(vm);
let end_line_obj = final_endline.to_pyobject(vm);
let column_obj = final_column.to_pyobject(vm);
let end_column_obj = final_end_column.to_pyobject(vm);
let column_obj = column.to_pyobject(vm);
let end_column_obj = end_column.to_pyobject(vm);

let tuple =
vm.ctx
Expand Down