Skip to content

Commit dcac548

Browse files
committed
pythongh-119553: Clear reader on Ctrl-C command
Also, do not print extra newline on before KeyboardInterrupt.
1 parent db00934 commit dcac548

4 files changed

Lines changed: 24 additions & 3 deletions

File tree

‎Lib/_pyrepl/commands.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ def do(self) -> None:
216216
import signal
217217

218218
self.reader.console.finish()
219+
self.reader.finish()
219220
os.kill(os.getpid(), signal.SIGINT)
220221

221222

‎Lib/_pyrepl/simple_interact.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ def more_lines(unicodetext: str) -> bool:
182182
assert not more
183183
input_n += 1
184184
except KeyboardInterrupt:
185-
console.write("\nKeyboardInterrupt\n")
185+
console.write("KeyboardInterrupt\n")
186186
console.resetbuffer()
187187
except MemoryError:
188-
console.write("\nMemoryError\n")
188+
console.write("MemoryError\n")
189189
console.resetbuffer()

‎Lib/test/test_pyrepl/support.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def code_to_events(code: str):
3939

4040

4141
def prepare_reader(console: Console, **kwargs):
42-
config = ReadlineConfig(readline_completer=None)
42+
config = ReadlineConfig(readline_completer=kwargs.pop("readline_completer", None))
4343
reader = ReadlineAlikeReader(console=console, config=config)
4444
reader.more_lines = partial(more_lines, namespace=None)
4545
reader.paste_mode = True # Avoid extra indents
@@ -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: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import itertools
22
import functools
3+
import rlcompleter
34
from unittest import TestCase
45

56
from .support import handle_all_events, handle_events_narrow_console, code_to_events, prepare_reader
@@ -176,3 +177,20 @@ def test_newline_within_block_trailing_whitespace(self):
176177
)
177178
self.assert_screen_equals(reader, expected)
178179
self.assertTrue(reader.finished)
180+
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+
print(reader.screen)
196+
self.assert_screen_equals(reader, code)

0 commit comments

Comments
 (0)