Skip to content

gh-93883: elide traceback indicators when possible #93994

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
pablogsal merged 13 commits into from
Jul 11, 2022
Merged

gh-93883: elide traceback indicators when possible #93994

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bd99c32
gh-93883: elide traceback indicators when possible
belm0 Jun 19, 2022
bba12b1
fix test_idle
belm0 Jun 19, 2022
6a8f56d
traceback.c: fix doc typo; simplify expression
belm0 Jun 23, 2022
94be186
traceback.c implementation
belm0 Jun 23, 2022
c06257b
fix test_cmd_line_script
belm0 Jun 24, 2022
87fafa6
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 24, 2022
a64635c
remove stray maxDiff from test
belm0 Jun 24, 2022
361da86
change testing strategy
belm0 Jun 24, 2022
d392332
update doc examples
belm0 Jun 24, 2022
f6927cd
Apply suggestions: doc formatting
belm0 Jun 28, 2022
4ff4b77
test_doctest: remove unneeded has_no_debug_ranges()
belm0 Jun 28, 2022
28d95b4
traceback.c: refactor elide check
belm0 Jun 28, 2022
8ac461f
doc additions:
belm0 Jun 28, 2022
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
traceback.c: fix doc typo; simplify expression
  • Loading branch information
@belm0
belm0 committed Jun 24, 2022
commit 6a8f56d92e4fdb432411ed747d08a32932f8e995
4 changes: 2 additions & 2 deletions Python/traceback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ print_error_location_carets(PyObject *f, int offset, Py_ssize_t start_offset, Py
int special_chars = (left_end_offset != -1 || right_start_offset != -1);
const char *str;
while (++offset <= end_offset) {
if (offset <= start_offset || offset > end_offset) {
if (offset <= start_offset) {
str = " ";
} else if (special_chars && left_end_offset < offset && offset <= right_start_offset) {
str = secondary;
Expand Down Expand Up @@ -813,7 +813,7 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
//
// ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE
// ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^~~~~~~~~~~~~~~~~~~~
// | |-> left_end_offset | |-> left_offset
// | |-> left_end_offset | |-> end_offset
Comment thread
belm0 marked this conversation as resolved.
// |-> start_offset |-> right_start_offset
//
// In general we will only have (start_offset, end_offset) but we can gather more information
Expand Down