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

bpo-30048: asyncio: fix Task.cancel() was ignored. #1097

Merged
merged 4 commits into from
May 11, 2017
Merged

bpo-30048: asyncio: fix Task.cancel() was ignored. #1097

merged 4 commits into from
May 11, 2017

Conversation

methane
Copy link
Member

@methane methane commented Apr 13, 2017 •
edited
Loading

example:

    async def coro():
        asyncio.Task.current_task().cancel()
        return 42
    ...
    res = await coro()  # should raise CancelledError

@mention-bot
Copy link

@methane, thanks for your PR! By analyzing the history of the files in this pull request, we identified @1st1, @benjaminp and @bitdancer to be potential reviewers.

@methane methane requested a review from 1st1 April 13, 2017 01:29
@methane methane force-pushed the asyncio-task-cancel branch 2 times, most recently from e2a323f to 4c881d3 Compare April 13, 2017 07:27
@methane
bpo-30048: asyncio: fix Task.cancel() was ignored.
1cc94c9 
example:

    async def coro():
        asyncio.Task.current_task().cancel()
        return 42
    ...
    res = await coro()  # should raise CancelledError
@methane methane force-pushed the asyncio-task-cancel branch from 4c881d3 to 1cc94c9 Compare April 13, 2017 07:55
1st1
1st1 approved these changes May 9, 2017
View reviewed changes
Copy link
Member

@1st1 1st1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@methane methane merged commit 991adca into python:master May 11, 2017
@methane methane deleted the asyncio-task-cancel branch May 11, 2017 12:18
@methane methane mentioned this pull request May 11, 2017
Merged
methane added a commit to methane/cpython that referenced this pull request May 11, 2017
@methane
bpo-30048: asyncio: fix Task.cancel() was ignored. (pythonGH-1097)
c3507d9 
when there are no more `await` or `yield (from)` before return in coroutine,
cancel was ignored.

example:

    async def coro():
        asyncio.Task.current_task().cancel()
        return 42
    ...
    res = await coro()  # should raise CancelledError
(cherry picked from commit 991adca)
methane added a commit to methane/cpython that referenced this pull request May 11, 2017
@methane
bpo-30048: asyncio: fix Task.cancel() was ignored. (pythonGH-1097)
3e26175 
when there are no more `await` or `yield (from)` before return in coroutine,
cancel was ignored.

example:

    async def coro():
        asyncio.Task.current_task().cancel()
        return 42
    ...
    res = await coro()  # should raise CancelledError
(cherry picked from commit 991adca)
@methane methane mentioned this pull request May 11, 2017
Merged
methane added a commit that referenced this pull request May 12, 2017
@methane
bpo-30048: asyncio: fix Task.cancel() was ignored. (GH-1547)
5e94ded 
* bpo-30048: asyncio: fix Task.cancel() was ignored. (GH-1097)

when there are no more `await` or `yield (from)` before return in coroutine,
cancel was ignored.

example:

    async def coro():
        asyncio.Task.current_task().cancel()
        return 42
    ...
    res = await coro()  # should raise CancelledError
(cherry picked from commit 991adca)

* fix test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1st1 1st1 1st1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@methane @mention-bot @1st1 @the-knights-who-say-ni