diff options
| author | Pablo Galindo Salgado <Pablogsal@gmail.com> | 2021-10-16 18:27:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 10:27:43 -0700 |
| commit | fe0d9e22a52a10c4cbe52254b51f2d4e74d83568 (patch) | |
| tree | 164d8d69ef92ef996cf43c4f4ae8ffeafc3980f7 | |
| parent | 5afa0a411243210a30526c7459a0ccff5cb88494 (diff) | |
| download | cpython-git-fe0d9e22a52a10c4cbe52254b51f2d4e74d83568.tar.gz | |
bpo-45249: Fix caret location when end_offset is set to 0 (GH-28855)
| -rw-r--r-- | Lib/test/test_traceback.py | 10 | ||||
| -rw-r--r-- | Lib/traceback.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2021-10-10-16-14-33.bpo-45249.xqLliz.rst | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 83d36e12c0..1c7db9d3d4 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -55,6 +55,9 @@ class TracebackCases(unittest.TestCase): def syntax_error_bad_indentation2(self): compile(" print(2)", "?", "exec") + def tokenizer_error_with_caret_range(self): + compile("blech ( ", "?", "exec") + def test_caret(self): err = self.get_exception_format(self.syntax_error_with_caret, SyntaxError) @@ -85,6 +88,13 @@ class TracebackCases(unittest.TestCase): self.assertEqual(err[1].find("y"), err[2].find("^")) # in the right place self.assertEqual(err[2].count("^"), len("y for y in range(30)")) + err = self.get_exception_format(self.tokenizer_error_with_caret_range, + SyntaxError) + self.assertIn("^", err[2]) # third line has caret + self.assertEqual(err[2].count('\n'), 1) # and no additional newline + self.assertEqual(err[1].find("("), err[2].find("^")) # in the right place + self.assertEqual(err[2].count("^"), 1) + def test_nocaret(self): exc = SyntaxError("error", ("x.py", 23, None, "bad syntax")) err = traceback.format_exception_only(SyntaxError, exc) diff --git a/Lib/traceback.py b/Lib/traceback.py index 3cb8e5700d..568f3ff28c 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -781,7 +781,7 @@ class TracebackException: if self.offset is not None: offset = self.offset - end_offset = self.end_offset if self.end_offset is not None else offset + end_offset = self.end_offset if self.end_offset not in {None, 0} else offset if offset == end_offset or end_offset == -1: end_offset = offset + 1 diff --git a/Misc/NEWS.d/next/Library/2021-10-10-16-14-33.bpo-45249.xqLliz.rst b/Misc/NEWS.d/next/Library/2021-10-10-16-14-33.bpo-45249.xqLliz.rst new file mode 100644 index 0000000000..1d5a857e25 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-10-16-14-33.bpo-45249.xqLliz.rst @@ -0,0 +1,2 @@ +Fix the behaviour of :func:`traceback.print_exc` when displaying the caret +when the ``end_offset`` in the exception is set to 0. Patch by Pablo Galindo |