Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bytes between entries be removed when removed is passed

Browse source
This commit is contained in:
Danny Lin 2025-05-27 00:18:52 +08:00
parent 926338cbc1
commit e76f9a1bc1
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_zipfile/test_core.py
View file

@ -1846,6 +1846,7 @@ def test_repack_bytes_between_files(self):
for i, (file, data) in enumerate(self.test_files):
zh.writestr(file, data)
fh.write(b' dummy bytes ')
zh.start_dir = fh.tell()
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
for i in ii:
zh.remove(self.test_files[i][0])
@ -2168,6 +2169,7 @@ def test_repack_removed_bytes_between_files(self):
zh.writestr(file, data)
expected_zinfos.append(ComparableZipInfo(zh.getinfo(file)))
fh.write(b' dummy bytes ')
zh.start_dir = fh.tell()
expected_size = os.path.getsize(TESTFN)
# do the removal and check the result
@ -2176,6 +2178,7 @@ def test_repack_removed_bytes_between_files(self):
for i, (file, data) in enumerate(self.test_files):
zh.writestr(file, data)
fh.write(b' dummy bytes ')
zh.start_dir = fh.tell()
with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
zinfos = [zh.remove(self.test_files[i][0]) for i in ii]
zh.repack(zinfos)

3
Lib/zipfile/__init__.py
View file

@ -1469,6 +1469,9 @@ def repack(self, zfile, removed=None):
raise BadZipFile(
f"Overlapped entries: {zinfo.orig_filename!r} ")
if removed is not None and zinfo not in removed_zinfos:
used_entry_size = entry_size
entry_size_list.append(entry_size)
used_entry_size_list.append(used_entry_size)