8000 bpo-39622: Interrupt the main asyncio task on Ctrl+C by asvetlov · Pull Request #32105 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-39622: Interrupt the main asyncio task on Ctrl+C #32105

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
asvetlov merged 22 commits into from
Mar 30, 2022
Merged

bpo-39622: Interrupt the main asyncio task on Ctrl+C #32105

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
15c68ea
bpo-39622: Interrupt the main asyncio task on Ctrl+C
asvetlov Mar 24, 2022
2fd2ab7
Use SIGINT only to catch Ctrl+C
asvetlov Mar 24, 2022
fc2938c
Cleanup
asvetlov Mar 25, 2022
fb78c7e
Make interruption stablier
asvetlov Mar 25, 2022
2fbe690
Drop redundant checks
asvetlov Mar 26, 2022
42d1fd8
Merge branch 'main' into asyncio-ctrl-c
asvetlov Mar 26, 2022
998ff9f
Update Lib/asyncio/runners.py
asvetlov Mar 26, 2022
e526b96
Add a docs section about keyboard interruption
asvetlov Mar 28, 2022
09cf923
Update Doc/library/asyncio-runner.rst
asvetlov Mar 29, 2022
65edc7e
Update Doc/library/asyncio-runner.rst
asvetlov Mar 29, 2022
60c7390
Update Doc/library/asyncio-runner.rst
asvetlov Mar 29, 2022
6fa8016
Update Doc/library/asyncio-runner.rst
asvetlov Mar 29, 2022
d456248
Update Doc/library/asyncio-runner.rst
asvetlov Mar 29, 2022
3d6ce84
Update Doc/library/asyncio-runner.rst
asvetlov Mar 29, 2022
881c5ef
Update Doc/library/asyncio-runner.rst
asvetlov Mar 29, 2022
ca9bccc
Update Lib/asyncio/runners.py
asvetlov Mar 29, 2022
4202b4a
Update Lib/asyncio/runners.py
asvetlov Mar 29, 2022
9e6cd47
Update Lib/asyncio/runners.py
asvetlov Mar 29, 2022
0c8a79a
Update Lib/asyncio/runners.py
asvetlov Mar 29, 2022
2a70c20
Update Lib/asyncio/runners.py
asvetlov Mar 29, 2022
83b055d
Merge branch 'main' into asyncio-ctrl-c
asvetlov Mar 29, 2022
5c8a6fa
Fix patchcheck
asvetlov Mar 29, 2022
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
Prev Previous commit
Next Next commit
Make interruption stablier
  • Loading branch information
@asvetlov
asvetlov committed Mar 25, 2022
commit fb78c7e81a6490e3e940b84917715acc3190b66c
6 changes: 5 additions & 1 deletion Lib/asyncio/runners.py
View file
Open in desktop
76C4
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,13 @@ def _lazy_init(self):
self._state = _State.INITIALIZED

def _on_sigint(self, signum, frame, main_task):
if self._loop is None or self._loop.is_closing():
return
self._interrunt_count += 1
if self._interrunt_count == 1:
if self._interrunt_count == 1 and not main_task.done():
main_task.cancel()
# wakeup a loop if it is blocked by selector.select() with long timeour
self._loop.call_soon_threadsafe(lambda: None)
return
raise KeyboardInterrupt()

Expand Down
0