X Tutup
Skip to content

gh-95051: ensure that timeouts scheduled with asyncio.Timeout that have already expired are deliverered promptly#95109

Merged
gvanrossum merged 9 commits intopython:mainfrom
graingert:asyncio-timeout-0-0
Jul 24, 2022
Merged

gh-95051: ensure that timeouts scheduled with asyncio.Timeout that have already expired are deliverered promptly#95109
gvanrossum merged 9 commits intopython:mainfrom
graingert:asyncio-timeout-0-0

Conversation

@graingert
Copy link
Contributor

@graingert graingert commented Jul 21, 2022 •
edited by bedevere-bot
Loading

graingert
graingert commented Jul 21, 2022
View reviewed changes
graingert
graingert commented Jul 21, 2022
View reviewed changes
graingert
graingert commented Jul 21, 2022
View reviewed changes
@graingert graingert force-pushed the asyncio-timeout-0-0 branch from c6281b2 to 51686d7 Compare July 21, 2022 23:06
@graingert graingert changed the title gh-95051: handle timeouts.timeout(0) and timeouts.timeout(-1) gh-95051: ensure that timeouts scheduled in the past with asyncio.Timeout are deliverered promptly Jul 21, 2022
graingert
graingert commented Jul 21, 2022
View reviewed changes
@graingert graingert changed the title gh-95051: ensure that timeouts scheduled in the past with asyncio.Timeout are deliverered promptly gh-95051: ensure that timeouts scheduled with asyncio.Timeout that have already expired are deliverered promptly Jul 21, 2022
@graingert graingert added the needs backport to 3.11 only security fixes label Jul 21, 2022
graingert
graingert commented Jul 21, 2022
View reviewed changes
@graingert graingert marked this pull request as ready for review July 22, 2022 09:42
@graingert graingert requested review from 1st1 and asvetlov as code owners July 22, 2022 09:42
@graingert @kumaraditya303
Update Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.us…
495cd2b 
…xA9r.rst

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
gvanrossum
gvanrossum reviewed Jul 22, 2022
View reviewed changes
Copy link
Member

@gvanrossum gvanrossum left a comment

Choose a reason for hiding this comment

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

LG, just a nit, and maybe now that we're testing this behavior, it should be noted in the docs?

graingert and others added 2 commits July 23, 2022 00:59
@graingert @gvanrossum
Update Lib/asyncio/timeouts.py
6b01baa 
Co-authored-by: Guido van Rossum <gvanrossum@gmail.com>
@graingert
document asyncio.timeout(-1)
b7fe485
@graingert graingert requested a review from gvanrossum July 23, 2022 00:53
@gvanrossum gvanrossum merged commit 0c6f898 into python:main Jul 24, 2022
@miss-islington
Copy link
Contributor

miss-islington commented Jul 24, 2022

Thanks @graingert for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Jul 24, 2022

Sorry @graingert and @gvanrossum, I had trouble checking out the 3.11 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 0c6f898005099be189ee65bcfda659f5fc13b802 3.11

@graingert graingert deleted the asyncio-timeout-0-0 branch July 24, 2022 20:18
@gvanrossum
Copy link
Member

gvanrossum commented Jul 24, 2022

@graingert please backport manually and ask Pablo for a review.

@AlexWaygood AlexWaygood added needs backport to 3.11 only security fixes and removed needs backport to 3.11 only security fixes labels Jul 24, 2022
@miss-islington
Copy link
Contributor

miss-islington commented Jul 24, 2022

Thanks @graingert for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

bedevere-bot commented Jul 24, 2022

GH-95216 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jul 24, 2022
@AlexWaygood
Copy link
Member

AlexWaygood commented Jul 24, 2022 •
edited
Loading

@graingert please backport manually and ask Pablo for a review.

When @miss-islington's message is "I had trouble checking out the 3.X branch" (as opposed to "I couldn't create the backport due to a merge conflict"), just removing and re-adding the label is usually enough to fix it :)

@graingert graingert added the needs backport to 3.11 only security fixes label Jul 24, 2022
@miss-islington
Copy link
Contributor

miss-islington commented Jul 24, 2022

Thanks @graingert for the PR, and @gvanrossum for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 24, 2022
@graingert @miss-islington
pythongh-95051: ensure that timeouts scheduled with asyncio.Timeout…
26d8a1c 
… that have already expired are deliverered promptly (pythonGH-95109)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
(cherry picked from commit 0c6f898)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
@AlexWaygood
Copy link
Member

AlexWaygood commented Jul 24, 2022

GH-95216 is a backport of this pull request to the 3.11 branch.

@graingert, I already removed and re-added the label — this is the backport here

@AlexWaygood AlexWaygood removed the needs backport to 3.11 only security fixes label Jul 24, 2022
@graingert
Copy link
Contributor Author

graingert commented Jul 24, 2022

argh I saw the email notification and had a stale copy of the PR page open

@AlexWaygood
Copy link
Member

AlexWaygood commented Jul 24, 2022

argh I saw the email notification and had a stale copy of the PR page open

It's race conditions all the way down

@gvanrossum
Copy link
Member

gvanrossum commented Jul 24, 2022

Maybe one of you can make the bot more user friendly?

@graingert
Copy link
Contributor Author

graingert commented Jul 24, 2022

It's race conditions all the way down

@AlexWaygood
Copy link
Member

AlexWaygood commented Jul 24, 2022

Maybe one of you can make the bot more user friendly?

It's been on my to-do list for a while.....

ambv pushed a commit that referenced this pull request Jul 26, 2022
@miss-islington @graingert
gh-95051: ensure that timeouts scheduled with asyncio.Timeout that …
19d9536 
…have already expired are deliverered promptly (GH-95109) (GH-95216)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
(cherry picked from commit 0c6f898)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
@kumaraditya303 kumaraditya303 mentioned this pull request Oct 2, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kumaraditya303 kumaraditya303 kumaraditya303 left review comments

@gvanrossum gvanrossum gvanrossum approved these changes

@1st1 1st1 Awaiting requested review from 1st1 1st1 is a code owner

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

Assignees

@gvanrossum gvanrossum

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@graingert @miss-islington @gvanrossum @bedevere-bot @AlexWaygood @kumaraditya303
X Tutup