8000 bpo-42130: Fix for explicit suppressing of cancellations in wait_for() by Dreamsorcerer · Pull Request #28149 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-42130: Fix for explicit suppressing of cancellations in wait_for() #28149

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

Closed
wants to merge 20 commits into from
Closed

bpo-42130: Fix for explicit suppressing of cancellations in wait_for() #28149

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9c2942a
Create test for suppressing cancellations
Dreamsorcerer Sep 3, 2021
7ff2c04
Update test_tasks.py
Dreamsorcerer Sep 3, 2021
cdaa9c8
Update test_tasks.py
Dreamsorcerer Sep 3, 2021
342222f
Update test_tasks.py
Dreamsorcerer Sep 3, 2021
01d9884
Use a sentinel
Dreamsorcerer Sep 3, 2021
af96f10
Fix test for issue37658
Dreamsorcerer Sep 4, 2021
1e5233d
Update test_tasks.py
Dreamsorcerer Sep 4, 2021
743177e
Fix original issue
Dreamsorcerer Sep 4, 2021
d7c0965
Remove test
Dreamsorcerer Sep 4, 2021
80f027b
Merge branch 'main' into patch-4
Dreamsorcerer Nov 29, 2021
4eb5de2
Create 2021-11-29-17-17-45.bpo-42130.Ho8dUh.rst
Dreamsorcerer Nov 29, 2021
a8f5c1f
Compare to tuple
Dreamsorcerer Dec 1, 2021
5de6b79
Use enum for sentinel
Dreamsorcerer Dec 1, 2021
5a79cf2
Missing import
Dreamsorcerer Dec 1, 2021
11e1214
Update tasks.py
Dreamsorcerer Dec 6, 2021
3a35126
Update tasks.py
Dreamsorcerer Dec 6, 2021
df15ac1
Update test_tasks.py
Dreamsorcerer Dec 15, 2021
7374366
Update tasks.py
Dreamsorcerer Dec 15, 2021
c694173
Revert mistaken changes.
Dreamsorcerer Dec 15, 2021
cb59377
Update 2021-11-29-17-17-45.bpo-42130.Ho8dUh.rst
Dreamsorcerer Dec 15, 2021
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
Use a sentinel
  • Loading branch information
@Dreamsorcerer
Dreamsorcerer authored Sep 3, 2021
commit 01d988459f6020a5bd2df73946a358c07a93b74a
8 changes: 5 additions & 3 deletions Lib/asyncio/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
from . import futures
from .coroutines import _is_coroutine

_SENTINEL = object()

# Helper to generate new task names
# This uses itertools.count() instead of a "+= 1" operation because the latter
# is not thread safe. See bpo-11866 for a longer explanation.
Expand Down Expand Up @@ -432,8 +434,8 @@ async def wait_for(fut, timeout):
# wait until the future completes or the timeout
try:
await waiter
except exceptions.CancelledError:
if fut.done():
except exceptions.CancelledError as e:
if fut.done() and _SENTINEL in e.args:
return fut.result()
else:
fut.remove_done_callback(cb)
Expand Down Expand Up @@ -516,7 +518,7 @@ async def _cancel_and_wait(fut, loop):
fut.add_done_callback(cb)

try:
fut.cancel()
fut.cancel(_SENTINEL)
# We cannot wait on *fut* directly to make
# sure _cancel_and_wait itself is reliably cancellable.
await waiter
Expand Down
0