Skip to content

gh-133016: Fix a reference to removed asyncio.futures.TimeoutError #133019

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
Merged
merged 4 commits into from
Apr 26, 2025
Merged

gh-133016: Fix a reference to removed asyncio.futures.TimeoutError #133019

merged 4 commits into from
Apr 26, 2025

Conversation

johnzhou721
Copy link
Contributor

@johnzhou721 johnzhou721 commented Apr 26, 2025 •
edited by bedevere-app bot
Loading

asyncio.futures.TimeoutError no longer exists, so we use the builtin TimeoutError instead.

@bedevere-app bedevere-app bot mentioned this pull request Apr 26, 2025
Closed
tomasr8
tomasr8 approved these changes Apr 26, 2025
View reviewed changes
Copy link
Member

@tomasr8 tomasr8 left a comment

Choose a reason for hiding this comment

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

Thanks! This is not a user-facing change so the news entry can be omitted ;)

@johnzhou721
Copy link
Contributor Author

@tomasr8 Taken out and thanks for reviewing. This is my 2nd patch for CPython.

@picnixz picnixz changed the title gh-133016: Fix a reference to removed futures.TimeoutError. gh-133016: Fix a reference to removed futures.TimeoutError Apr 26, 2025
@picnixz picnixz changed the title gh-133016: Fix a reference to removed futures.TimeoutError gh-133016: Fix a reference to removed asyncio.futures.TimeoutError Apr 26, 2025
@tomasr8
Copy link
Member

tomasr8 commented Apr 26, 2025

already done ;)

@picnixz picnixz enabled auto-merge (squash) April 26, 2025 17:58
@picnixz picnixz added the needs backport to 3.13 bugs and security fixes label Apr 26, 2025
@picnixz
Copy link
Member

picnixz commented Apr 26, 2025 •
edited
Loading

Ah, actually, when was the reference removed? just to know whether I can backport this or not.

@picnixz picnixz removed the needs backport to 3.13 bugs and security fixes label Apr 26, 2025
@johnzhou721
Copy link
Contributor Author

Will investigate.

@bedevere-app
Copy link

bedevere-app bot commented Apr 26, 2025

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@picnixz picnixz disabled auto-merge April 26, 2025 18:06
@johnzhou721
Copy link
Contributor Author

@gvanrossum Done. Thanks for creating Python and also for reviewing my patch so carefully.

@johnzhou721
Copy link
Contributor Author

I have made the requested changes; please review again

@bedevere-app
Copy link

bedevere-app bot commented Apr 26, 2025

Thanks for making the requested changes!

@gvanrossum, @picnixz: please review the changes made to this pull request.

@bedevere-app bedevere-app bot requested review from gvanrossum and picnixz April 26, 2025 18:16
@gvanrossum
Copy link
Member

@picnixz Should probably backport to 3.13 and 3.12 at least.

@johnzhou721
Copy link
Contributor Author

Just rebased onto main.

@gvanrossum
Copy link
Member

Just rebased onto main.

Oh, you didn't have to do that. It's harmless, but this will be done anyway during the actual merge.

Thanks for your contribution!

@gvanrossum gvanrossum enabled auto-merge (squash) April 26, 2025 18:42
@picnixz picnixz added the needs backport to 3.13 bugs and security fixes label Apr 26, 2025
@picnixz
Copy link
Member

picnixz commented Apr 26, 2025

(We'll backport until 3.13 as 3.12 is security-only)

@gvanrossum gvanrossum merged commit 8d6d738 into python:main Apr 26, 2025
40 checks passed
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 26, 2025
@johnzhou721 @miss-islington
pythongh-133016: Fix a reference to removed `asyncio.futures.TimeoutE…
4cbaaaa 
…rror` (pythonGH-133019)

Just use the builtin `TimeoutError`, and remove the import of `futures`.
(cherry picked from commit 8d6d738)

Co-authored-by: John <john-xyz@outlook.com>
@bedevere-app
Copy link

bedevere-app bot commented Apr 26, 2025

GH-133023 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Apr 26, 2025
picnixz pushed a commit that referenced this pull request Apr 26, 2025
@miss-islington @johnzhou721
[3.13] gh-133016: Fix a reference to removed `asyncio.futures.Timeout…
3a1a2a0 
…Error` (GH-133019) (#133023)

gh-133016: Fix a reference to removed `asyncio.futures.TimeoutError` (GH-133019)

Just use the builtin `TimeoutError`, and remove the import of `futures`.
(cherry picked from commit 8d6d738)

Co-authored-by: John <john-xyz@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gvanrossum gvanrossum gvanrossum approved these changes

@tomasr8 tomasr8 tomasr8 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

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

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

@picnixz picnixz Awaiting requested review from picnixz

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

Successfully merging this pull request may close these issues.
4 participants
@johnzhou721 @tomasr8 @picnixz @gvanrossum