apply suggestion from review, ensure calls in handler are safe

Author: richardsheridan

src/trio/_repl.py

@@ -15,15 +15,22 @@
 from trio._util import final
 
 
+class SuppressDecorator(contextlib.ContextDecorator, contextlib.suppress):
+    pass
+
+
 @final
 class TrioInteractiveConsole(InteractiveConsole):
     # code.InteractiveInterpreter defines locals as Mapping[str, Any]
     # but when we pass this to FunctionType it expects a dict. So
     # we make the type more specific on our subclass
     locals: dict[str, object]
 
-    def __init__(self, repl_locals: dict[str, object] | None = None) -> None:
+    def __init__(
+        self, repl_locals: dict[str, object], trio_token: trio.lowlevel.TrioToken
+    ) -> None:
         super().__init__(locals=repl_locals)
+        self.trio_token = trio_token
         self.compile.compiler.flags |= ast.PyCF_ALLOW_TOP_LEVEL_AWAIT
 
     def runcode(self, code: types.CodeType) -> None:
@@ -70,17 +77,24 @@ def raw_input(self, prompt: str = "") -> str:
     else:
 
         def raw_input(self, prompt: str = "") -> str:
-            import fcntl
-            import termios
             from signal import SIGINT, signal
 
             interrupted = False
 
+            @SuppressDecorator(KeyboardInterrupt)
+            @trio.lowlevel.disable_ki_protection
+            def newline():
+                import fcntl
+                import termios
+
+                # Fake up a newline char as if user had typed it at
+                # os.write(sys.stdin.buffer.fileno(), b"\n")
+                fcntl.ioctl(sys.stdin, termios.TIOCSTI, b"\n")
+
             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")
+                self.trio_token.run_sync_soon(newline, idempotent=True)
 
             prev_handler = trio.from_thread.run_sync(signal, SIGINT, handler)
             try:
@@ -91,14 +105,16 @@ def handler(sig: int, frame: types.FrameType | None) -> None:
                     raise KeyboardInterrupt
 
 
-async def run_repl(console: TrioInteractiveConsole) -> None:
+async def run_repl(repl_locals: dict[str, object]) -> None:
     banner = (
         f"trio REPL {sys.version} on {sys.platform}\n"
         f'Use "await" directly instead of "trio.run()".\n'
         f'Type "help", "copyright", "credits" or "license" '
         f"for more information.\n"
         f'{getattr(sys, "ps1", ">>> ")}import trio'
     )
+    token = trio.lowlevel.current_trio_token()
+    console = TrioInteractiveConsole(repl_locals, token)
     try:
         await trio.to_thread.run_sync(console.interact, banner)
     finally:
@@ -124,5 +140,4 @@ def main(original_locals: dict[str, object]) -> None:
     }:
         repl_locals[key] = original_locals[key]
 
-    console = TrioInteractiveConsole(repl_locals)
-    trio.run(run_repl, console)
+    trio.run(run_repl, repl_locals)