[3.13] gh-121804: Always show error location for SyntaxError's in new repl (GH-121886...

(cherry picked from commit 354d55eb1fa40f272419aa6459ee5d2c4804c8ea)

diff --git a/Lib/_pyrepl/console.py b/Lib/_pyrepl/console.py
index a8d3f520340dcfff566d3f067489aa672ac1e955..43193432af2ec6062165927c88e4df8e0f7d6b71 100644 (file)
--- a/Lib/_pyrepl/console.py
+++ b/Lib/_pyrepl/console.py
@@ -161,8 +161,8 @@ class InteractiveColoredConsole(code.InteractiveConsole):
         super().__init__(locals=locals, filename=filename, local_exit=local_exit)  # type: ignore[call-arg]
         self.can_colorize = _colorize.can_colorize()
 
-    def showsyntaxerror(self, filename=None):
-        super().showsyntaxerror(colorize=self.can_colorize)
+    def showsyntaxerror(self, filename=None, **kwargs):
+        super().showsyntaxerror(colorize=self.can_colorize, **kwargs)
 
     def showtraceback(self):
         super().showtraceback(colorize=self.can_colorize)
@@ -171,7 +171,7 @@ class InteractiveColoredConsole(code.InteractiveConsole):
         try:
             tree = ast.parse(source)
         except (SyntaxError, OverflowError, ValueError):
-            self.showsyntaxerror(filename)
+            self.showsyntaxerror(filename, source=source)
             return False
         if tree.body:
             *_, last_stmt = tree.body
@@ -188,10 +188,10 @@ class InteractiveColoredConsole(code.InteractiveConsole):
                         f"Try the asyncio REPL ({python} -m asyncio) to use"
                         f" top-level 'await' and run background asyncio tasks."
                     )
-                self.showsyntaxerror(filename)
+                self.showsyntaxerror(filename, source=source)
                 return False
             except (OverflowError, ValueError):
-                self.showsyntaxerror(filename)
+                self.showsyntaxerror(filename, source=source)
                 return False
 
             if code is None:

diff --git a/Lib/code.py b/Lib/code.py
index 7d68517fc5c59aff97ce5f29ccda491f89439507..aec7d61c1b896d3c7ef728b3b912eea94dfb88de 100644 (file)
--- a/Lib/code.py
+++ b/Lib/code.py
@@ -64,7 +64,7 @@ class InteractiveInterpreter:
             code = self.compile(source, filename, symbol)
         except (OverflowError, SyntaxError, ValueError):
             # Case 1
-            self.showsyntaxerror(filename)
+            self.showsyntaxerror(filename, source=source)
             return False
 
         if code is None:
@@ -123,6 +123,12 @@ class InteractiveInterpreter:
                 # Stuff in the right filename
                 value = SyntaxError(msg, (filename, lineno, offset, line))
                 sys.last_exc = sys.last_value = value
+        # Set the line of text that the exception refers to
+        source = kwargs.pop('source', '')
+        lines = source.splitlines()
+        if (source and type is SyntaxError
+                and not value.text and len(lines) >= value.lineno):
+            value.text = lines[value.lineno - 1]
         if sys.excepthook is sys.__excepthook__:
             lines = traceback.format_exception_only(type, value, colorize=colorize)
             self.write(''.join(lines))

diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index d8b2652d5d7979c26069c75eee29b6fee3a7bfe5..e882c6cb3b8d19cdfa4491fe9fc0938dc7d2a186 100755 (executable)
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -706,7 +706,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
             del _filename, _sys, _dirname, _dir
             \n""".format(filename))
 
-    def showsyntaxerror(self, filename=None):
+    def showsyntaxerror(self, filename=None, **kwargs):
         """Override Interactive Interpreter method: Use Colorizing
 
         Color the offending position instead of printing it and pointing at it

diff --git a/Lib/test/test_pyrepl/test_interact.py b/Lib/test/test_pyrepl/test_interact.py
index 538dfd36de2cd26f6938126f9293ceea492a72e8..e71ab419570a86c11a2852e0235bbd91d5201f3b 100644 (file)
--- a/Lib/test/test_pyrepl/test_interact.py
+++ b/Lib/test/test_pyrepl/test_interact.py
@@ -88,6 +88,20 @@ class TestSimpleInteract(unittest.TestCase):
         self.assertFalse(result)
         self.assertIn('SyntaxError', f.getvalue())
 
+    @force_not_colorized
+    def test_runsource_show_syntax_error_location(self):
+        console = InteractiveColoredConsole()
+        source = "def f(x, x): ..."
+        f = io.StringIO()
+        with contextlib.redirect_stderr(f):
+            result = console.runsource(source)
+        self.assertFalse(result)
+        r = """
+    def f(x, x): ...
+             ^
+SyntaxError: duplicate argument 'x' in function definition"""
+        self.assertIn(r, f.getvalue())
+
     def test_runsource_shows_syntax_error_for_failed_compilation(self):
         console = InteractiveColoredConsole()
         source = "print('Hello, world!'"

diff --git a/Misc/NEWS.d/next/Library/2024-07-16-20-49-07.gh-issue-121804.gYN-In.rst b/Misc/NEWS.d/next/Library/2024-07-16-20-49-07.gh-issue-121804.gYN-In.rst
new file mode 100644 (file)
index 0000000..1cc1cde
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-07-16-20-49-07.gh-issue-121804.gYN-In.rst
@@ -0,0 +1,2 @@
+Correctly show error locations, when :exc:`SyntaxError` raised in new repl.
+Patch by Sergey B Kirpichev.