Skip to content

gh-122356: restore the position of a file-like object after zipfile.is_zipfile #122397

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

Merged
jaraco merged 4 commits into from
Nov 24, 2024
Merged

gh-122356: restore the position of a file-like object after zipfile.is_zipfile #122397

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4989d50
Ensure that `zipfile.is_zipfile` does not modify a file object.
picnixz Jul 29, 2024
76a8e4a
add tests
picnixz Jul 29, 2024
ca77c4d
blurb
picnixz Jul 29, 2024
0410d36
Merge branch 'main' into feat-restore-pos-after-is-zipfile
picnixz Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Ensure that zipfile.is_zipfile does not modify a file object.
  • Loading branch information
@picnixz
picnixz committed Jul 29, 2024
commit 4989d502c2179f0dbcd513d95eb9eb445077c559
2 changes: 2 additions & 0 deletions Lib/zipfile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ def is_zipfile(filename):
result = False
try:
if hasattr(filename, "read"):
pos = filename.tell()
result = _check_zipfile(fp=filename)
filename.seek(pos)
Comment on lines +244 to +246
Copy link
Copy Markdown
Member

@jaraco jaraco Nov 24, 2024

Choose a reason for hiding this comment

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

I'm guessing that a user will never call is_zipfile on a non-seekable stream (e.g. a web response stream)... but if they did, this change would break those cases. Oh, I just checked, and the current check already relies on a seekable fp, so this change has no effect on that behavior.

else:
with open(filename, "rb") as fp:
result = _check_zipfile(fp)
Expand Down