Also consider cancel counts for swallowing CancelledError on asyncio #606
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
graingert
reviewed
Aug 26, 2023
src/anyio/_backends/_asyncio.py
Outdated
| self._host_task.uncancel() | ||
| while self._cancel_calls: | ||
| self._cancel_calls -= 1 | ||
| if not self._host_task.uncancel() and not self._cancel_calls: |
There was a problem hiding this comment.
I think cancel scopes need to store the current task.cancelling() value and compare to that rather than 0 like asyncio.timeout does in 3.11.4
There was a problem hiding this comment.
try:
asyncio.current_task.cancel()
await anyio.sleep(1)
except CancelledError:
try:
with CancelScope() as scope:
scope.cancel()
try:
await anyio.sleep(0)
except asyncio.CancelledError:
raise asyncio.CancelledError
except asyncio.CancelledError:
pytest.fail("Should have swallowed the CancelledError")There was a problem hiding this comment.
graingert
requested changes
Aug 26, 2023
src/anyio/_backends/_asyncio.py
Outdated
| self._host_task.uncancel() | ||
| while self._cancel_calls: | ||
| self._cancel_calls -= 1 | ||
| if not self._host_task.uncancel() and not self._cancel_calls: |
There was a problem hiding this comment.
try:
asyncio.current_task.cancel()
await anyio.sleep(1)
except CancelledError:
try:
with CancelScope() as scope:
scope.cancel()
try:
await anyio.sleep(0)
except asyncio.CancelledError:
raise asyncio.CancelledError
except asyncio.CancelledError:
pytest.fail("Should have swallowed the CancelledError")…lling the host task
|
Updated the code and the test. |
graingert
approved these changes
Aug 26, 2023
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes cases on Python 3.11+ where a third party library catches a
CancelledErrorand raises another one without including the original message. At least asyncpg is known to do this.