gh-111201: Allow pasted code to contain multiple statements in the REPL (#118712)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>

diff --git a/Lib/_pyrepl/commands.py b/Lib/_pyrepl/commands.py
index bb6bebace30ec87d4d8d8e089eda53b11b1f30f6..456cba0769c952e949c5bfc909ca47e0f5660f50 100644 (file)
--- a/Lib/_pyrepl/commands.py
+++ b/Lib/_pyrepl/commands.py
@@ -460,6 +460,8 @@ class show_history(Command):
 class paste_mode(Command):
 
     def do(self) -> None:
+        if not self.reader.paste_mode:
+            self.reader.was_paste_mode_activated = True
         self.reader.paste_mode = not self.reader.paste_mode
         self.reader.dirty = True
 
@@ -467,8 +469,9 @@ class paste_mode(Command):
 class enable_bracketed_paste(Command):
     def do(self) -> None:
         self.reader.paste_mode = True
+        self.reader.was_paste_mode_activated = True
 
 class disable_bracketed_paste(Command):
     def do(self) -> None:
         self.reader.paste_mode = False
-        self.reader.insert("\n")
+        self.reader.dirty = True

diff --git a/Lib/_pyrepl/reader.py b/Lib/_pyrepl/reader.py
index d84c164a05308de73598223f45e96b4dc4a54c9e..d15a150180811d6cf77fc12732c42bb8825646e0 100644 (file)
--- a/Lib/_pyrepl/reader.py
+++ b/Lib/_pyrepl/reader.py
@@ -221,6 +221,7 @@ class Reader:
     dirty: bool = False
     finished: bool = False
     paste_mode: bool = False
+    was_paste_mode_activated: bool = False
     commands: dict[str, type[Command]] = field(default_factory=make_default_commands)
     last_command: type[Command] | None = None
     syntax_table: dict[str, int] = field(default_factory=make_default_syntax_table)

diff --git a/Lib/_pyrepl/readline.py b/Lib/_pyrepl/readline.py
index 37ba98d4c8c87a5a2d344589b968db8e796ae60a..d28a7f3779f3021e2a83b1002e09702cc45156d7 100644 (file)
--- a/Lib/_pyrepl/readline.py
+++ b/Lib/_pyrepl/readline.py
@@ -298,10 +298,11 @@ class _ReadlineWrapper:
             reader.more_lines = more_lines
             reader.ps1 = reader.ps2 = ps1
             reader.ps3 = reader.ps4 = ps2
-            return reader.readline()
+            return reader.readline(), reader.was_paste_mode_activated
         finally:
             reader.more_lines = saved
             reader.paste_mode = False
+            reader.was_paste_mode_activated = False
 
     def parse_and_bind(self, string: str) -> None:
         pass  # XXX we don't support parsing GNU-readline-style init files

diff --git a/Lib/_pyrepl/simple_interact.py b/Lib/_pyrepl/simple_interact.py
index 4bc8368169336a3c9aba95c1b1668a438095fd6f..31b2097a78a2268951e4b00b39d65f6ceb5b0907 100644 (file)
--- a/Lib/_pyrepl/simple_interact.py
+++ b/Lib/_pyrepl/simple_interact.py
@@ -135,7 +135,7 @@ def run_multiline_interactive_console(
             ps1 = getattr(sys, "ps1", ">>> ")
             ps2 = getattr(sys, "ps2", "... ")
             try:
-                statement = multiline_input(more_lines, ps1, ps2)
+                statement, contains_pasted_code = multiline_input(more_lines, ps1, ps2)
             except EOFError:
                 break
 
@@ -144,7 +144,10 @@ def run_multiline_interactive_console(
 
             input_name = f"<python-input-{input_n}>"
             linecache._register_code(input_name, statement, "<stdin>")  # type: ignore[attr-defined]
-            more = console.push(_strip_final_indent(statement), filename=input_name)  # type: ignore[call-arg]
+            symbol = "single" if not contains_pasted_code else "exec"
+            more = console.push(_strip_final_indent(statement), filename=input_name, _symbol=symbol)  # type: ignore[call-arg]
+            if contains_pasted_code and more:
+                more = console.push(_strip_final_indent(statement), filename=input_name, _symbol="single")  # type: ignore[call-arg]
             assert not more
             input_n += 1
         except KeyboardInterrupt:

diff --git a/Lib/code.py b/Lib/code.py
index 1ee1ad62ff4506e3602e65589c1663361c4d8857..9d124563f728c2363c1d4992cdd0063677dda2ac 100644 (file)
--- a/Lib/code.py
+++ b/Lib/code.py
@@ -281,7 +281,7 @@ class InteractiveConsole(InteractiveInterpreter):
             elif exitmsg != '':
                 self.write('%s\n' % exitmsg)
 
-    def push(self, line, filename=None):
+    def push(self, line, filename=None, _symbol="single"):
         """Push a line to the interpreter.
 
         The line should not have a trailing newline; it may have
@@ -299,7 +299,7 @@ class InteractiveConsole(InteractiveInterpreter):
         source = "\n".join(self.buffer)
         if filename is None:
             filename = self.filename
-        more = self.runsource(source, filename)
+        more = self.runsource(source, filename, symbol=_symbol)
         if not more:
             self.resetbuffer()
         return more

diff --git a/Lib/test/test_pyrepl.py b/Lib/test/test_pyrepl.py
index bb9e36bc69ba4da1fdd9fd4cc32f6c5352b2f74b..c8990b699b214cb1b61fca2045be4955b97d30ba 100644 (file)
--- a/Lib/test/test_pyrepl.py
+++ b/Lib/test/test_pyrepl.py
@@ -23,6 +23,7 @@ from _pyrepl.console import Console, Event
 from _pyrepl.readline import ReadlineAlikeReader, ReadlineConfig
 from _pyrepl.simple_interact import _strip_final_indent
 from _pyrepl.unix_eventqueue import EventQueue
+from _pyrepl.simple_interact import InteractiveColoredConsole
 
 
 def more_lines(unicodetext, namespace=None):
@@ -830,7 +831,6 @@ class TestPasteEvent(TestCase):
             '    else:\n'
             '      pass\n'
         )
-        # fmt: on
 
         output_code = (
             'def a():\n'
@@ -841,8 +841,8 @@ class TestPasteEvent(TestCase):
             '\n'
             '    else:\n'
             '      pass\n'
-            '\n'
         )
+        # fmt: on
 
         paste_start = "\x1b[200~"
         paste_end = "\x1b[201~"
@@ -857,6 +857,22 @@ class TestPasteEvent(TestCase):
         output = multiline_input(reader)
         self.assertEqual(output, output_code)
 
+    def test_bracketed_paste_single_line(self):
+        input_code = "oneline"
+
+        paste_start = "\x1b[200~"
+        paste_end = "\x1b[201~"
+
+        events = itertools.chain(
+            code_to_events(paste_start),
+            code_to_events(input_code),
+            code_to_events(paste_end),
+            code_to_events("\n"),
+        )
+        reader = self.prepare_reader(events)
+        output = multiline_input(reader)
+        self.assertEqual(output, input_code)
+
 
 class TestReader(TestCase):
     def assert_screen_equals(self, reader, expected):
@@ -986,5 +1002,5 @@ class TestReader(TestCase):
         self.assert_screen_equals(reader, "")
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     unittest.main()