gh-94732: Fix KeyboardInterrupt race in asyncio run_forever() (#97765)

Ensure that the event loop's `_thread_id` attribute and the asyncgen hooks set by `sys.set_asyncgen_hooks()` are always restored no matter where a KeyboardInterrupt exception is raised.
This commit is contained in:
hetmankp 2022-10-04 07:34:35 +11:00 committed by GitHub
parent 873a2f2527
commit 3a49dbb98c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -606,12 +606,13 @@ class BaseEventLoop(events.AbstractEventLoop):
self._check_closed()
self._check_running()
self._set_coroutine_origin_tracking(self._debug)
self._thread_id = threading.get_ident()
old_agen_hooks = sys.get_asyncgen_hooks()
sys.set_asyncgen_hooks(firstiter=self._asyncgen_firstiter_hook,
finalizer=self._asyncgen_finalizer_hook)
try:
self._thread_id = threading.get_ident()
sys.set_asyncgen_hooks(firstiter=self._asyncgen_firstiter_hook,
finalizer=self._asyncgen_finalizer_hook)
events._set_running_loop(self)
while True:
self._run_once()