From: Batuhan Taskaya <batuhan@python.org>
Date: Sat, 24 Jul 2021 17:50:39 +0000 (+0300)
Subject: bpo-43950: support long lines in traceback.py (GH-27336)
X-Git-Tag: v3.11.0a1~584
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f5980a4f57dab68b9137304f58bd08891d43d5a;p=thirdparty%2FPython%2Fcpython.git

bpo-43950: support long lines in traceback.py (GH-27336)
---

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index c87ce7245335..5fc5b5926d5a 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -510,6 +510,28 @@ class TracebackErrorLocationCaretTests(unittest.TestCase):
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
+    def test_traceback_very_long_line(self):
+        source = "a" * 256
+        bytecode = compile(source, TESTFN, "exec")
+
+        with open(TESTFN, "w") as file:
+            file.write(source)
+        self.addCleanup(unlink, TESTFN)
+
+        func = partial(exec, bytecode)
+        result_lines = self.get_exception(func)
+
+        lineno_f = bytecode.co_firstlineno
+        expected_error = (
+            'Traceback (most recent call last):\n'
+            f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
+            '    callable()\n'
+            '    ^^^^^^^^^^\n'
+            f'  File "{TESTFN}", line {lineno_f}, in <module>\n'
+            f'    {source}\n'
+        )
+        self.assertEqual(result_lines, expected_error.splitlines())
+
     def assertSpecialized(self, func, expected_specialization):
         result_lines = self.get_exception(func)
         specialization_line = result_lines[-1]
diff --git a/Lib/traceback.py b/Lib/traceback.py
index ae5775d2f3bd..15bdb3c8c2e6 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -462,7 +462,11 @@ class StackSummary(list):
             row.append('    {}\n'.format(frame.line.strip()))
 
             stripped_characters = len(frame._original_line) - len(frame.line.lstrip())
-            if frame.end_lineno == frame.lineno and frame.end_colno != 0:
+            if (
+                frame.end_lineno == frame.lineno
+                and frame.colno is not None
+                and frame.end_colno is not None
+            ):
                 colno = _byte_offset_to_character_offset(frame._original_line, frame.colno)
                 end_colno = _byte_offset_to_character_offset(frame._original_line, frame.end_colno)