aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Lib/asyncio/__main__.py
diff options
context:
space:
mode:
authorƁukasz Langa <lukasz@langa.pl>2024-09-06 21:28:29 +0200
committerGitHub <noreply@github.com>2024-09-06 21:28:29 +0200
commit033510e11dff742d9626b9fd895925ac77f566f1 (patch)
tree312afe4e65696542145747bc525868fb1816a7d6 /Lib/asyncio/__main__.py
parent0c080d7c77d826c1afab7bd6b73f61e714cffcb7 (diff)
downloadcpython-033510e11dff742d9626b9fd895925ac77f566f1.tar.gz
cpython-033510e11dff742d9626b9fd895925ac77f566f1.zip
gh-120221: Support KeyboardInterrupt in asyncio REPL (#123795)
This switches the main pyrepl event loop to always be non-blocking so that it can listen to incoming interruptions from other threads. This also resolves invalid display of exceptions from other threads (gh-123178). This also fixes freezes with pasting and an active input hook.
Diffstat (limited to 'Lib/asyncio/__main__.py')
-rw-r--r--Lib/asyncio/__main__.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/Lib/asyncio/__main__.py b/Lib/asyncio/__main__.py
index 111b7d92367..5120140e061 100644
--- a/Lib/asyncio/__main__.py
+++ b/Lib/asyncio/__main__.py
@@ -127,6 +127,15 @@ class REPLThread(threading.Thread):
loop.call_soon_threadsafe(loop.stop)
+ def interrupt(self) -> None:
+ if not CAN_USE_PYREPL:
+ return
+
+ from _pyrepl.simple_interact import _get_reader
+ r = _get_reader()
+ if r.threading_hook is not None:
+ r.threading_hook.add("") # type: ignore
+
if __name__ == '__main__':
sys.audit("cpython.run_stdin")
@@ -184,6 +193,7 @@ if __name__ == '__main__':
keyboard_interrupted = True
if repl_future and not repl_future.done():
repl_future.cancel()
+ repl_thread.interrupt()
continue
else:
break