Fix this better by detecting paste mode

pablogsal · pablogsal · commit 7429e73273c1 · 2024-05-07T15:38:34.000+01:00
diff --git a/Lib/_pyrepl/commands.py b/Lib/_pyrepl/commands.py
@@ -460,13 +460,16 @@ def do(self) -> None:
 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
 
 
 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:
diff --git 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
@@ -298,10 +298,11 @@ def multiline_input(self, more_lines, ps1, ps2):
             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
@@ -77,9 +77,7 @@ def __init__(
     def showtraceback(self):
         super().showtraceback(colorize=self.can_colorize)
 
-    def push(self, line, filename=None, symbol="single"):
-        if line.count("\n") > 0:
-            symbol = "exec"
+    def push(self, line, filename=None, symbol='single'):
         return super().push(line, filename=filename, _symbol=symbol)
 
 
@@ -140,7 +138,7 @@ def more_lines(unicodetext: str) -> bool:
             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
 
@@ -149,7 +147,10 @@ def more_lines(unicodetext: str) -> bool:
 
             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)
+            symbol = "single" if not contains_pasted_code else "exec"
+            more = console.push(_strip_final_indent(statement), filename=input_name, symbol=symbol)
+            if contains_pasted_code and more:
+                more = console.push(_strip_final_indent(statement), filename=input_name, symbol="single")
             assert not more
             input_n += 1
         except KeyboardInterrupt:
