Skip to content

gh-106922: Support multi-line error locations in traceback (attempt 2) #112097

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 6 commits into from
Dec 1, 2023
Merged

gh-106922: Support multi-line error locations in traceback (attempt 2) #112097

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
2644341
Support multi-line error locations in traceback (attempt 2)
williamwen42 Nov 15, 2023
c1f8d0b
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 15, 2023
3152844
fix lint and doc test failures
williamwen42 Nov 17, 2023
425c874
address pr comments
williamwen42 Nov 21, 2023
873501f
Merge branch 'main' into multiline-traceback-attempt-2
williamwen42 Dec 1, 2023
99094bb
add more comments, address some nits
williamwen42 Dec 1, 2023
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
Next Next commit
Support multi-line error locations in traceback (attempt 2)
  • Loading branch information
@williamwen42
williamwen42 committed Nov 21, 2023
commit 26443410022536a1c13775570f7bc9477780c40e
3 changes: 3 additions & 0 deletions Lib/test/test_doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2905,6 +2905,9 @@ def test_unicode(): """
Traceback (most recent call last):
File ...
exec(compile(example.source, filename, "single",
~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
compileflags, True), test.globs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "<doctest foo-bär@baz[0]>", line 1, in <module>
raise Exception('clé')
Exception: clé
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,14 +2080,15 @@ def test_multiline_not_highlighted(self):
""",
[
' 1 < 2 and',
' 3 > 4',
'AssertionError',
],
),
]
for source, expected in cases:
with self.subTest(source):
result = self.write_source(source)
self.assertEqual(result[-2:], expected)
self.assertEqual(result[-len(expected):], expected)


class SyntaxErrorTests(unittest.TestCase):
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_repl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,11 @@ def foo(x):
output = kill_python(p)
self.assertEqual(p.returncode, 0)

traceback_lines = output.splitlines()[-7:-1]
traceback_lines = output.splitlines()[-8:-1]
expected_lines = [
' File "<stdin>", line 1, in <module>',
' foo(0)',
' ~~~^^^',
' File "<stdin>", line 2, in foo',
' 1 / x',
' ~~^~~',
Expand Down
6 changes: 4 additions & 2 deletions Lib/test/test_sys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,17 +1115,19 @@ def check(tracebacklimit, expected):
b'Traceback (most recent call last):',
b' File "<string>", line 8, in <module>',
b' f2()',
b' ~~^^',
b' File "<string>", line 6, in f2',
b' f1()',
b' ~~^^',
b' File "<string>", line 4, in f1',
b' 1 / 0',
b' ~~^~~',
b'ZeroDivisionError: division by zero'
]
check(10, traceback)
check(3, traceback)
check(2, traceback[:1] + traceback[3:])
check(1, traceback[:1] + traceback[5:])
check(2, traceback[:1] + traceback[4:])
check(1, traceback[:1] + traceback[7:])
check(0, [traceback[-1]])
check(-1, [traceback[-1]])
check(1<<1000, traceback)
Expand Down
Loading