Skip to content
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

Jump to bottom

GH-111693: Propagate correct asyncio.CancelledError instance out of asyncio.Condition.wait() #111694

Merged
merged 14 commits into from
Jan 8, 2024
Merged

GH-111693: Propagate correct asyncio.CancelledError instance out of asyncio.Condition.wait() #111694

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c3aff47
Add test and fix case where original CancelledError was not re-raised.
kristjanvalur Nov 3, 2023
111e74a
Simplify Lock/Semaphore error handling, also deal with any error.
kristjanvalur Nov 3, 2023
6d41771
Remove vestigial code from Future
kristjanvalur Nov 4, 2023
4e16fa7
fix whitespace
kristjanvalur Nov 4, 2023
ad56f29
Apply suggestions from code review
kristjanvalur Nov 20, 2023
30e0ec4
Restructure try/except, and improve comments
kristjanvalur Nov 21, 2023
6d59820
Merge remote-tracking branch 'kristjan/kristjan/CancelledError' into …
kristjanvalur Nov 21, 2023
c060f40
Apply suggestions from code review
kristjanvalur Nov 21, 2023
62bd6cd
Suggestsions from code review.
kristjanvalur Nov 26, 2023
01046c5
comment and add tests for waking up multiple FIFO tasks in the Semaphore
kristjanvalur Nov 26, 2023
8802dfa
Fix comment typo
gvanrossum Dec 30, 2023
f7c103c
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 7, 2024
1572b2b
Format, capitalize, punctuate comments.
kristjanvalur Jan 7, 2024
dce420e
Merge branch 'main' into kristjan/CancelledError
kristjanvalur Jan 7, 2024
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
fix whitespace
  • Loading branch information
@kristjanvalur
kristjanvalur committed Nov 4, 2023
commit 4e16fa765bbd5b22ba3e52256667eded7574fc1e
6 changes: 3 additions & 3 deletions Lib/test/test_asyncio/test_locks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ async def func():
await cond.wait_for(lambda: wake)
raised = err.exception
raise raised

task = asyncio.create_task(func())
await asyncio.sleep(0)
# Task is waiting on the condition, cancel it there
Expand All @@ -799,7 +799,7 @@ async def func():
await cond.wait_for(lambda: wake)
raised = err.exception
raise raised

task = asyncio.create_task(func())
await asyncio.sleep(0)
# Task is waiting on the condition
Expand All @@ -815,7 +815,7 @@ async def func():
self.assertEqual(err.exception.args, ("foo",))
# we should have got the _same_ exception instance as the one originally raised
self.assertIs(err.exception, raised)

class SemaphoreTests(unittest.IsolatedAsyncioTestCase):

def test_initial_value_zero(self):
Expand Down
Loading