diff options
| author | hetmankp <728670+hetmankp@users.noreply.github.com> | 2022-10-03 20:34:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 20:34:35 (GMT) |
| commit | 3a49dbb98ccc1b90554ed181386316efa38adfba (patch) | |
| tree | c1bee19994568f421a70243d6b9e4e480e2332ed /Lib | |
| parent | 873a2f25272ca9fb027866a9730c44ba627b30cc (diff) | |
| download | cpython-3a49dbb98ccc1b90554ed181386316efa38adfba.zip cpython-3a49dbb98ccc1b90554ed181386316efa38adfba.tar.gz cpython-3a49dbb98ccc1b90554ed181386316efa38adfba.tar.bz2 | |
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.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/asyncio/base_events.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index 2df9dca..66202f0 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -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() |