From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:44:33 +0000 (+0200)
Subject: [3.13] gh-119553: Fix console when pressing Ctrl-C within a multiline block (GH-12007... 
X-Git-Tag: v3.13.0b2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ac0ccf9d33349eb4024c4b1f4661ca4b7fd372c;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-119553: Fix console when pressing Ctrl-C within a multiline block (GH-120075) (#120076)

(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 e94e8c25d379..6bffed1bfe93 100644
--- 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 256bbc7c6d76..2e5698eb1316 100644
--- 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")