]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-94732: Fix KeyboardInterrupt race in asyncio run_forever() (#97765)
authorhetmankp <728670+hetmankp@users.noreply.github.com>
Mon, 3 Oct 2022 20:34:35 +0000 (07:34 +1100)
committerGitHub <noreply@github.com>
Mon, 3 Oct 2022 20:34:35 +0000 (13:34 -0700)
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.

Lib/asyncio/base_events.py

index 2df9dcac8f723f7e9000bedde860c2735ee5e924..66202f09794db801e90372a86586922bf2c8ca25 100644 (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()