Skip to content

gh-136170: Revert adding ZipFile.data_offset #136950

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
merged 5 commits into from
Jul 21, 2025
+3 −75
Merged

gh-136170: Revert adding ZipFile.data_offset #136950

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8eb63c9
Revert "gh-84481: Make ZipFile.data_offset more robust (#132178)"
emmatyping Jul 21, 2025
4221022
Revert "gh-84481: Add ZipFile.data_offset attribute (#132165)"
emmatyping Jul 21, 2025
c341057
NEWS entry about the removal.
gpshead Jul 21, 2025
8309110
reword news
gpshead Jul 21, 2025
289b7cd
Update Misc/NEWS.d/next/Library/2025-07-21-22-35-50.gh-issue-136170.Q…
picnixz Jul 21, 2025
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
Revert "gh-84481: Make ZipFile.data_offset more robust (#132178)" 
This reverts commit 6cd1d6c.
  • Loading branch information
@emmatyping
emmatyping committed Jul 21, 2025
commit 8eb63c9d886112400a0c703c277962e225e8d688
8 changes: 1 addition & 7 deletions Lib/test/test_zipfile/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3506,12 +3506,6 @@ def test_data_offset_write_with_prefix(self):
with zipfile.ZipFile(fp, "w") as zipfp:
self.assertEqual(zipfp.data_offset, 16)

def test_data_offset_append_with_bad_zip(self):
with io.BytesIO() as fp:
fp.write(b"this is a prefix")
with zipfile.ZipFile(fp, "a") as zipfp:
self.assertEqual(zipfp.data_offset, 16)

def test_data_offset_write_no_tell(self):
# The initializer in ZipFile checks if tell raises AttributeError or
# OSError when creating a file in write mode when deducing the offset
Expand All @@ -3521,7 +3515,7 @@ def tell(self):
raise OSError("Unimplemented!")
with NoTellBytesIO() as fp:
with zipfile.ZipFile(fp, "w") as zipfp:
self.assertIsNone(zipfp.data_offset)
self.assertIs(zipfp.data_offset, None)


class EncodedMetadataTests(unittest.TestCase):
Expand Down
3 changes: 1 addition & 2 deletions Lib/zipfile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,6 @@ def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True,
self._lock = threading.RLock()
self._seekable = True
self._writing = False
self._data_offset = None

try:
if mode == 'r':
Expand All @@ -1468,6 +1467,7 @@ def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True,
self.fp = _Tellable(self.fp)
self.start_dir = 0
self._seekable = False
self._data_offset = None
else:
# Some file-like objects can provide tell() but not seek()
try:
Expand All @@ -1488,7 +1488,6 @@ def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=True,
# even if no files are added to the archive
self._didModify = True
self.start_dir = self.fp.tell()
self._data_offset = self.start_dir
else:
raise ValueError("Mode must be 'r', 'w', 'x', or 'a'")
except:
Expand Down