Skip to content

gh-131492: gh-131461: handle exceptions in GzipFile constructor while owning resources #131462

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 20 commits into from
Mar 20, 2025
Merged

gh-131492: gh-131461: handle exceptions in GzipFile constructor while owning resources #131462

merged 20 commits into from
Mar 20, 2025

Conversation

graingert
Copy link
Contributor

@graingert graingert commented Mar 19, 2025 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot mentioned this pull request Mar 19, 2025
Closed
graingert
graingert commented Mar 19, 2025
View reviewed changes
@graingert graingert marked this pull request as ready for review March 19, 2025 14:28
@graingert graingert requested a review from vstinner March 19, 2025 14:38
vstinner
vstinner reviewed Mar 19, 2025
View reviewed changes
@vstinner
Copy link
Member

@cmaloney: Would you mind to review this fix?

vstinner
vstinner reviewed Mar 19, 2025
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

Would it be possible to write a test with such broken file object?

@graingert graingert requested a review from ethanfurman as a code owner March 19, 2025 16:31
@graingert
Copy link
Contributor Author

Would it be possible to write a test with such broken file object?

There's already a test in test_tarfile: test_open_nonwritable_fileobj the failure will be enforced by #128973

I added check_no_resource_warning to make the assert hold until then

vstinner
vstinner reviewed Mar 19, 2025
View reviewed changes
graingert and others added 2 commits March 19, 2025 17:10
@graingert
refactor gzip closing
2217713
@graingert @vstinner
Update Lib/gzip.py
97ca4d3 
Co-authored-by: Victor Stinner <vstinner@python.org>
vstinner
vstinner approved these changes Mar 19, 2025
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM

@vstinner
Copy link
Member

The CI fails:

TypeError: check_no_resource_warning() missing 1 required positional argument: 'testcase'

@graingert @vstinner
Update Lib/gzip.py
c9661e1 
Co-authored-by: Victor Stinner <vstinner@python.org>
@graingert
Copy link
Contributor Author

The CI fails:

TypeError: check_no_resource_warning() missing 1 required positional argument: 'testcase'

🤦

@graingert graingert changed the title gh-131461: fix ResourceWarning when writing a unwritable gzipfile gh-131492: gh-131461: fix ResourceWarning when writing a unwritable gzipfile Mar 20, 2025
@bedevere-app bedevere-app bot mentioned this pull request Mar 20, 2025
Closed
@graingert graingert added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Mar 20, 2025
@graingert graingert changed the title gh-131492: gh-131461: fix ResourceWarning when writing a unwritable gzipfile gh-131492: gh-131461: handle exceptions in GzipFile constructor while owning resources Mar 20, 2025
serhiy-storchaka
serhiy-storchaka approved these changes Mar 20, 2025
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

LGTM.

I would add support.gc_collect() in tests.

graingert and others added 2 commits March 20, 2025 16:40
@graingert @vstinner
Update Misc/NEWS.d/next/Library/2025-03-20-08-32-49.gh-issue-131492.s…
052937f 
…aC2cA.rst

Co-authored-by: Victor Stinner <vstinner@python.org>
@graingert @vstinner
Update Misc/NEWS.d/next/Library/2025-03-20-08-32-49.gh-issue-131492.s…
643a00d 
…aC2cA.rst

Co-authored-by: Victor Stinner <vstinner@python.org>
@vstinner vstinner enabled auto-merge (squash) March 20, 2025 16:49
vstinner
vstinner approved these changes Mar 20, 2025
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM

@vstinner vstinner merged commit ce79274 into python:main Mar 20, 2025
39 checks passed
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 20, 2025
@graingert @vstinner @miss-islington
pythongh-131492, pythongh-131461: handle exceptions in GzipFile const…
f0190a4 
…ructor while owning resources (pythonGH-131462)

(cherry picked from commit ce79274)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
@bedevere-app
Copy link

bedevere-app bot commented Mar 20, 2025

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 20, 2025
@graingert @vstinner @miss-islington
pythongh-131492, pythongh-131461: handle exceptions in GzipFile const…
f4ed247 
…ructor while owning resources (pythonGH-131462)

(cherry picked from commit ce79274)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Mar 20, 2025
@bedevere-app
Copy link

bedevere-app bot commented Mar 20, 2025

GH-131519 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 only security fixes label Mar 20, 2025
@vstinner
Copy link
Member

Hum, the backports mention ResourceWarning, whereas ResourceWarning only exists in Python 3.14. If we want to backport this change to 3.13 and 3.12, maybe references to ResourceWarning should be removed?

What do you think @graingert?

@graingert
Copy link
Contributor Author

graingert commented Mar 20, 2025 •
edited
Loading

Oh yeah nix the 3.14 specific bits of the changelog from the backports

@graingert graingert deleted the fix-resource-warning-in-gzipfile-ctor branch March 20, 2025 17:35
@graingert
Copy link
Contributor Author

I've removed the references to a ResourceWarning in the backports

vstinner added a commit that referenced this pull request Mar 21, 2025
@miss-islington @graingert @vstinner
[3.13] gh-131492, gh-131461: handle exceptions in GzipFile constructo…
0a22407 
…r while owning resources (GH-131462) (#131518)

(cherry picked from commit ce79274)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
vstinner added a commit that referenced this pull request Mar 21, 2025
@miss-islington @graingert @vstinner
[3.12] gh-131492, gh-131461: handle exceptions in GzipFile constructo…
2d6a778 
…r while owning resources (GH-131462) (#131519)

(cherry picked from commit ce79274)

Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
seehwan pushed a commit to seehwan/cpython that referenced this pull request Apr 16, 2025
@graingert @vstinner @seehwan80
pythongh-131492, pythongh-131461: handle exceptions in GzipFile const…
4696861 
…ructor while owning resources (python#131462)

Co-authored-by: Victor Stinner <vstinner@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmaloney cmaloney cmaloney left review comments

@vstinner vstinner vstinner approved these changes

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

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

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
@graingert @vstinner @cmaloney @serhiy-storchaka