mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-15 07:15:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[3.12] bpo-43950: handle wide unicode characters in tracebacks (GH-28150) (#111346)

Browse source
This commit is contained in:
Pablo Galindo Salgado 2023-10-27 06:43:38 +09:00 • committed by GitHub
parent e25d8b40cd
commit c81ebf5b3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 187 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Python/traceback.c
View file

@ -900,8 +900,39 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
goto done;
}
if (print_error_location_carets(f, truncation, start_offset, end_offset,
right_start_offset, left_end_offset,
// Convert all offsets to display offsets (e.g. the space they would take up if printed
// on the screen).
Py_ssize_t dp_start = _PyPegen_calculate_display_width(source_line, start_offset);
if (dp_start < 0) {
err = ignore_source_errors() < 0;
goto done;
}
Py_ssize_t dp_end = _PyPegen_calculate_display_width(source_line, end_offset);
if (dp_end < 0) {
err = ignore_source_errors() < 0;
goto done;
}
Py_ssize_t dp_left_end = -1;
Py_ssize_t dp_right_start = -1;
if (has_secondary_ranges) {
dp_left_end = _PyPegen_calculate_display_width(source_line, left_end_offset);
if (dp_left_end < 0) {
err = ignore_source_errors() < 0;
goto done;
}
dp_right_start = _PyPegen_calculate_display_width(source_line, right_start_offset);
if (dp_right_start < 0) {
err = ignore_source_errors() < 0;
goto done;
}
}
if (print_error_location_carets(f, truncation, dp_start, dp_end,
dp_right_start, dp_left_end,
primary_error_char, secondary_error_char) < 0) {
err = -1;
goto done;