Skip to content

Improve REPL KI #3030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
+250 −3
Open

Improve REPL KI #3030

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
39d0ca2
improve repl KI
richardsheridan Jun 13, 2024
46a3f02
Merge branch 'main' into repl_ki
CoolCat467 Feb 15, 2025
a5dcdbf
apply suggestion from review, ensure calls in handler are safe
richardsheridan Mar 23, 2025
039bad1
grab token and install handler in one go
richardsheridan Mar 27, 2025
240f9ff
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 27, 2025
611a89d
Merge branch 'main' into repl_ki
A5rocks Jun 29, 2025
301f361
Don't add extra newlines on KI
A5rocks Jul 2, 2025
95f0d33
Add some tests
A5rocks Jul 2, 2025
b71a1b8
First pass at CI failures
A5rocks Jul 2, 2025
919cc8b
The CI runners have `dev.tty.legacy_tiocsti` set to `0`
A5rocks Jul 2, 2025
6c8d1e4
Hacky fixes for Windows
A5rocks Jul 2, 2025
04abe8d
Try to avoid flakiness
A5rocks Jul 2, 2025
7f135cc
Address PR review and first pass at codecov
A5rocks Jul 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/trio/_repl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,42 @@ def runcode(self, code: types.CodeType) -> None:
# We always use sys.excepthook, unlike other implementations.
# This means that overriding self.write also does nothing to tbs.
sys.excepthook(sys.last_type, sys.last_value, sys.last_traceback)
# clear any residual KI
trio.from_thread.run(trio.lowlevel.checkpoint_if_cancelled)
# trio.from_thread.check_cancelled() has too long of a memory

if sys.platform == "win32":

def raw_input(self, prompt: str = "") -> str:
try:
return input(prompt)
except EOFError:
# check if trio has a pending KI
trio.from_thread.run(trio.lowlevel.checkpoint_if_cancelled)
raise

else:

def raw_input(self, prompt: str = "") -> str:
import fcntl
import termios
from signal import SIGINT, signal

interrupted = False

def handler(sig: int, frame: types.FrameType | None) -> None:
nonlocal interrupted
interrupted = True
# Fake up a newline char as if user had typed it at terminal
fcntl.ioctl(sys.stdin, termios.TIOCSTI, b"\n")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can't write to sys.stdin from a handler safely, I'm not sure if you can icotl to the .fileno() or not either, I think you need:

@disable_ki_protection
def _newline():
    # Fake up a newline char as if user had typed it at terminal
    fcntl.ioctl(sys.stdin, termios.TIOCSTI, b"\n")


class TrioInteractiveConsole:
    token = trio.lowlevel.current_trio_token()

    def handler(...):
        nonlocal interrupted
        interrupted = True
        token.run_sync_soon(_newline, idempotent=True)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I think I understand why, but won't a keyboard interrupt in the newline function blow up trio and end the repl? If so, Would suppressing the exception be sufficient?


prev_handler = trio.from_thread.run_sync(signal, SIGINT, handler)
try:
return input(prompt)
finally:
trio.from_thread.run_sync(signal, SIGINT, prev_handler)
if interrupted:
raise KeyboardInterrupt


async def run_repl(console: TrioInteractiveConsole) -> None:
Expand Down
Loading