mirror of
https://github.com/python/cpython.git
synced 2025-08-03 00:23:06 +00:00
bpo-45249: Fix caret location when end_offset is set to 0 (GH-28855)
(cherry picked from commit fe0d9e22a5
)
Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
This commit is contained in:
parent
855d6247ad
commit
5df35faf36
3 changed files with 13 additions and 1 deletions
|
@ -51,6 +51,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)
|
||||
|
@ -81,6 +84,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)
|
||||
|
|
|
@ -633,7 +633,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
|
||||
|
||||
|
|
|
@ -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
|
Loading…
Add table
Add a link
Reference in a new issue