[3.13] gh-119553: Fix console when pressing Ctrl-C within a multiline block (GH-12007...

(cherry picked from commit 69b3e8ea569faabccd74036e3d0e5ec7c0c62a20)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>

diff --git a/Lib/_pyrepl/commands.py b/Lib/_pyrepl/commands.py
index e94e8c25d379c155f35978902374f9cf175366ac..6bffed1bfe9327908ead2a0ce78f68d781e3e3f4 100644 (file)
--- a/Lib/_pyrepl/commands.py
+++ b/Lib/_pyrepl/commands.py
@@ -216,11 +216,13 @@ class interrupt(FinishCommand):
         import signal
 
         self.reader.console.finish()
+        self.reader.finish()
         os.kill(os.getpid(), signal.SIGINT)
 
 
 class ctrl_c(Command):
     def do(self) -> None:
+        self.reader.console.finish()
         self.reader.finish()
         raise KeyboardInterrupt
 

diff --git a/Lib/_pyrepl/simple_interact.py b/Lib/_pyrepl/simple_interact.py
index 256bbc7c6d7626aeea867a8255bf29b34c5b3190..2e5698eb131684f24cd70a0685a7ef32c487121d 100644 (file)
--- a/Lib/_pyrepl/simple_interact.py
+++ b/Lib/_pyrepl/simple_interact.py
@@ -149,7 +149,7 @@ def run_multiline_interactive_console(
             assert not more
             input_n += 1
         except KeyboardInterrupt:
-            console.write("\nKeyboardInterrupt\n")
+            console.write("KeyboardInterrupt\n")
             console.resetbuffer()
         except MemoryError:
             console.write("\nMemoryError\n")