gh-119553: Clear reader on Ctrl-C command (GH-119801)

diff --git a/Lib/_pyrepl/commands.py b/Lib/_pyrepl/commands.py
index 2ef5dada9d9e5886afc399b69440dd815bffa0aa..e94e8c25d379c155f35978902374f9cf175366ac 100644 (file)
--- a/Lib/_pyrepl/commands.py
+++ b/Lib/_pyrepl/commands.py
@@ -221,6 +221,7 @@ class interrupt(FinishCommand):
 
 class ctrl_c(Command):
     def do(self) -> None:
+        self.reader.finish()
         raise KeyboardInterrupt
 
 

diff --git a/Lib/test/test_pyrepl/support.py b/Lib/test/test_pyrepl/support.py
index e807b5f34045509d68a1572c32f80076dfad6128..70e12286f7d78154d6df8a2d127eaeeedd49a8f1 100644 (file)
--- a/Lib/test/test_pyrepl/support.py
+++ b/Lib/test/test_pyrepl/support.py
@@ -75,6 +75,8 @@ def handle_all_events(
             reader.handle1()
     except StopIteration:
         pass
+    except KeyboardInterrupt:
+        pass
     return reader, console
 
 

diff --git a/Lib/test/test_pyrepl/test_reader.py b/Lib/test/test_pyrepl/test_reader.py
index d02815bfa11d74d2bb759d19348cac7cd8e44457..079c963d19aad5bdb1237a8c5949b6035013a3ed 100644 (file)
--- a/Lib/test/test_pyrepl/test_reader.py
+++ b/Lib/test/test_pyrepl/test_reader.py
@@ -179,6 +179,22 @@ class TestReader(TestCase):
         self.assert_screen_equals(reader, expected)
         self.assertTrue(reader.finished)
 
+    def test_keyboard_interrupt_clears_screen(self):
+        namespace = {"itertools": itertools}
+        code = "import itertools\nitertools."
+        events = itertools.chain(code_to_events(code), [
+            Event(evt='key', data='\t', raw=bytearray(b'\t')),  # Two tabs for completion
+            Event(evt='key', data='\t', raw=bytearray(b'\t')),
+            Event(evt='key', data='\x03', raw=bytearray(b'\x03')),  # Ctrl-C
+        ])
+
+        completing_reader = functools.partial(
+            prepare_reader,
+            readline_completer=rlcompleter.Completer(namespace).complete
+        )
+        reader, _ = handle_all_events(events, prepare_reader=completing_reader)
+        self.assertEqual(reader.calc_screen(), code.split("\n"))
+
     def test_prompt_length(self):
         # Handles simple ASCII prompt
         ps1 = ">>> "