Skip to content

Commit 5c50dc7

Browse files
lysnikolaoumiss-islington
authored andcommitted
pythongh-119553: Clear reader on Ctrl-C command (pythonGH-119801)
(cherry picked from commit 010ea93) Co-authored-by: Lysandros Nikolaou <[email protected]>
1 parent 2acbdc2 commit 5c50dc7

3 files changed

Lines changed: 19 additions & 0 deletions

File tree

‎Lib/_pyrepl/commands.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ def do(self) -> None:
221221

222222
class ctrl_c(Command):
223223
def do(self) -> None:
224+
self.reader.finish()
224225
raise KeyboardInterrupt
225226

226227

‎Lib/test/test_pyrepl/support.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ def handle_all_events(
7575
reader.handle1()
7676
except StopIteration:
7777
pass
78+
except KeyboardInterrupt:
79+
pass
7880
return reader, console
7981

8082

‎Lib/test/test_pyrepl/test_reader.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,22 @@ def test_newline_within_block_trailing_whitespace(self):
178178
self.assert_screen_equals(reader, expected)
179179
self.assertTrue(reader.finished)
180180

181+
def test_keyboard_interrupt_clears_screen(self):
182+
namespace = {"itertools": itertools}
183+
code = "import itertools\nitertools."
184+
events = itertools.chain(code_to_events(code), [
185+
Event(evt='key', data='\t', raw=bytearray(b'\t')), # Two tabs for completion
186+
Event(evt='key', data='\t', raw=bytearray(b'\t')),
187+
Event(evt='key', data='\x03', raw=bytearray(b'\x03')), # Ctrl-C
188+
])
189+
190+
completing_reader = functools.partial(
191+
prepare_reader,
192+
readline_completer=rlcompleter.Completer(namespace).complete
193+
)
194+
reader, _ = handle_all_events(events, prepare_reader=completing_reader)
195+
self.assertEqual(reader.calc_screen(), code.split("\n"))
196+
181197
def test_prompt_length(self):
182198
# Handles simple ASCII prompt
183199
ps1 = ">>> "

0 commit comments

Comments
 (0)