Skip to content

[3.11] gh-94732: Fix KeyboardInterrupt race in asyncio run_forever() (GH-97765) #97792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Oct 3, 2022
Merged

[3.11] gh-94732: Fix KeyboardInterrupt race in asyncio run_forever() (GH-97765) #97792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-94732: Fix KeyboardInterrupt race in asyncio run_forever() (GH-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.
(cherry picked from commit 3a49dbb)

Co-authored-by: hetmankp <728670+hetmankp@users.noreply.github.com>
  • Loading branch information
@hetmankp @miss-islington
hetmankp authored and miss-islington committed Oct 3, 2022
commit 0d7548ef682cfd07b9f30b55e392abd036b3663a
7 changes: 4 additions & 3 deletions Lib/asyncio/base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,12 +595,13 @@ def run_forever(self):
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()
Expand Down