zipremove 0.4.0__tar.gz → 0.5.0__tar.gz

{zipremove-0.4.0/src/zipremove.egg-info → zipremove-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zipremove
-Version: 0.4.0
+Version: 0.5.0
 Summary: Extend `zipfile` with `remove`-related functionalities
 Home-page: https://github.com/danny0838/zipremove
 Author: Danny Lin
@@ -52,7 +52,7 @@ This package extends `zipfile` with `remove`-related functionalities.
    a path is provided.
 
    This does not physically remove the local file entry from the archive.
-   Call `ZipFile.repack` afterwards to reclaim space.
+   Call `repack` afterwards to reclaim space.
 
    The archive must be opened with mode ``'w'``, ``'x'`` or ``'a'``.
 

{zipremove-0.4.0 → zipremove-0.5.0}/README.md

@@ -18,7 +18,7 @@ This package extends `zipfile` with `remove`-related functionalities.
    a path is provided.
 
    This does not physically remove the local file entry from the archive.
-   Call `ZipFile.repack` afterwards to reclaim space.
+   Call `repack` afterwards to reclaim space.
 
    The archive must be opened with mode ``'w'``, ``'x'`` or ``'a'``.
 

{zipremove-0.4.0 → zipremove-0.5.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = zipremove
-version = 0.4.0
+version = 0.5.0
 author = Danny Lin
 author_email = danny0838@gmail.com
 url = https://github.com/danny0838/zipremove

{zipremove-0.4.0 → zipremove-0.5.0}/src/zipremove/__init__.py

@@ -82,7 +82,7 @@ class _ZipRepacker:
 
     def copy(self, zfile, zinfo, filename):
         # make a copy of zinfo
-        zinfo2 = copy.deepcopy(zinfo)
+        zinfo2 = copy.copy(zinfo)
 
         # apply sanitized new filename as in `ZipInfo.__init__`
         zinfo2.orig_filename = filename
@@ -90,7 +90,7 @@ class _ZipRepacker:
 
         zinfo2.header_offset = zfile.start_dir
 
-        # polyfill: update zinfo2._end_offset if exists
+        # polyfill: clear zinfo2._end_offset if exists
         # (Python >= 3.8 with fix #109858)
         if hasattr(zinfo2, '_end_offset'):
             zinfo2._end_offset = None
@@ -113,10 +113,9 @@ class _ZipRepacker:
         """
         Repack the ZIP file, stripping unreferenced local file entries.
 
-        Assumes that local file entries are stored consecutively, with no gaps
-        or overlaps.
-
-        Behavior:
+        Assumes that local file entries (and the central directory, which is
+        mostly treated as the "last entry") are stored consecutively, with no
+        gaps or overlaps:
 
         1. If any referenced entry overlaps with another, a `BadZipFile` error
            is raised since safe repacking cannot be guaranteed.
@@ -129,8 +128,8 @@ class _ZipRepacker:
            be a sequence of consecutive entries with no extra preceding bytes;
            extra following bytes are preserved.
 
-        4. This is to prevent an unexpected data removal (false positive),
-           though a false negative may happen in certain rare cases.
+        This is to prevent an unexpected data removal (false positive), though
+        a false negative may happen in certain rare cases.
 
         Examples:
 
@@ -180,8 +179,8 @@ class _ZipRepacker:
             - Modifies the ZIP file in place.
             - Updates zfile.start_dir to account for removed data.
             - Sets zfile._didModify to True.
-            - Updates header_offset and _end_offset of referenced ZipInfo
-              instances.
+            - Updates header_offset and clears _end_offset of referenced
+              ZipInfo instances.
 
         Parameters:
             zfile: A ZipFile object representing the archive to repack.
@@ -262,14 +261,11 @@ class _ZipRepacker:
                         used_entry_size,
                     )
 
-                if used_entry_size < entry_size:
-                    stale_entry_size = self._validate_local_file_entry_sequence(
-                        fp,
-                        old_header_offset + used_entry_size,
-                        old_header_offset + entry_size,
-                    )
-                else:
-                    stale_entry_size = 0
+                stale_entry_size = self._validate_local_file_entry_sequence(
+                    fp,
+                    old_header_offset + used_entry_size,
+                    old_header_offset + entry_size,
+                )
 
                 if stale_entry_size > 0:
                     self._copy_bytes(
@@ -286,17 +282,11 @@ class _ZipRepacker:
         zfile.start_dir -= entry_offset
         zfile._didModify = True
 
-        # polyfill: update ZipInfo._end_offset if exists
+        # polyfill: clear ZipInfo._end_offset if exists
         # (Python >= 3.8 with fix #109858)
         if hasattr(ZipInfo, '_end_offset'):
-            end_offset = zfile.start_dir
-            for zinfo in reversed(filelist):
-                if zinfo in removed_zinfos:
-                    zinfo._end_offset = None
-                else:
-                    if zinfo._end_offset is not None:
-                        zinfo._end_offset = end_offset
-                    end_offset = zinfo.header_offset
+            for zinfo in filelist:
+                zinfo._end_offset = None
 
     def _calc_initial_entry_offset(self, fp, data_offset):
         checked_offsets = {}
@@ -380,8 +370,8 @@ class _ZipRepacker:
         if pos > end_offset:
             return None
 
+        # parse zip64
         try:
-            # parse zip64
             try:
                 zinfo._decodeExtra(crc32(filename))
             except TypeError:
@@ -617,15 +607,16 @@ class ZipFile(ZipFile):
 
         with self._lock:
             # get the zinfo
-            # raise KeyError if arcname does not exist
             if isinstance(zinfo_or_arcname, ZipInfo):
                 zinfo = zinfo_or_arcname
-                if zinfo not in self.filelist:
-                    raise KeyError('There is no item %r in the archive' % zinfo)
             else:
+                # raise KeyError if arcname does not exist
                 zinfo = self.getinfo(zinfo_or_arcname)
 
-            self.filelist.remove(zinfo)
+            try:
+                self.filelist.remove(zinfo)
+            except ValueError:
+                raise KeyError('There is no item %r in the archive' % zinfo) from None
 
             try:
                 del self.NameToInfo[zinfo.filename]

{zipremove-0.4.0 → zipremove-0.5.0/src/zipremove.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zipremove
-Version: 0.4.0
+Version: 0.5.0
 Summary: Extend `zipfile` with `remove`-related functionalities
 Home-page: https://github.com/danny0838/zipremove
 Author: Danny Lin
@@ -52,7 +52,7 @@ This package extends `zipfile` with `remove`-related functionalities.
    a path is provided.
 
    This does not physically remove the local file entry from the archive.
-   Call `ZipFile.repack` afterwards to reclaim space.
+   Call `repack` afterwards to reclaim space.
 
    The archive must be opened with mode ``'w'``, ``'x'`` or ``'a'``.
 

{zipremove-0.4.0 → zipremove-0.5.0}/tests/test_zipfile.py

@@ -1,12 +1,13 @@
+import contextlib
 import io
 import itertools
 import os
 import struct
 import sys
+import time
 import unittest
 import unittest.mock as mock
 import warnings
-from contextlib import nullcontext
 
 import zipremove as zipfile
 
@@ -42,8 +43,11 @@ def requires_zip64fix(reason='requires Python >= 3.11.4 for zip64 fix (#103861)'
     return unittest.skipUnless(sys.version_info >= (3, 11, 4), reason)
 
 
-def ComparableZipInfo(zinfo):
-    return (zinfo.filename, zinfo.header_offset, zinfo.compress_size, zinfo.CRC)
+class ComparableZipInfo:
+    keys = [i for i in zipfile.ZipInfo.__slots__ if not i.startswith('_')]
+
+    def __new__(cls, zinfo):
+        return {i: getattr(zinfo, i) for i in cls.keys}
 
 _struct_pack = struct.pack
 
@@ -59,6 +63,8 @@ def struct_pack_no_dd_sig(fmt, *values):
 
 class RepackHelperMixin:
     """Common helpers for remove and repack."""
+    maxDiff = 8192
+
     @classmethod
     def _prepare_test_files(cls):
         return [
@@ -69,37 +75,48 @@ class RepackHelperMixin:
 
     @classmethod
     def _prepare_zip_from_test_files(cls, zfname, test_files, force_zip64=False):
-        zinfos = []
         with zipfile.ZipFile(zfname, 'w', cls.compression) as zh:
             for file, data in test_files:
                 with zh.open(file, 'w', force_zip64=force_zip64) as fh:
                     fh.write(data)
-                zinfo = zh.getinfo(file)
-                zinfos.append(ComparableZipInfo(zinfo))
-        return zinfos
+            return list(zh.infolist())
 
 class AbstractCopyTests(RepackHelperMixin):
     @classmethod
     def setUpClass(cls):
         cls.test_files = cls._prepare_test_files()
 
+    def tearDown(self):
+        unlink(TESTFN)
+
     def test_copy_by_name(self):
         for i in range(3):
             with self.subTest(i=i, filename=self.test_files[i][0]):
                 zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
                 with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-                    zi_new = ('file.txt', zh.start_dir, *zinfos[i][2:])
+                    zi_new = {
+                        **ComparableZipInfo(zinfos[i]),
+                        'filename': 'file.txt',
+                        'orig_filename': 'file.txt',
+                        'header_offset': zh.start_dir,
+                    }
                     zh.copy(self.test_files[i][0], 'file.txt')
 
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [*(zi for j, zi in enumerate(zinfos)), zi_new],
+                        [*(ComparableZipInfo(zi) for zi in zinfos), zi_new],
                     )
 
                     # check NameToInfo cache
                     self.assertEqual(ComparableZipInfo(zh.getinfo('file.txt')), zi_new)
 
+                    # check content
+                    self.assertEqual(
+                        zh.read(zi_new['filename']),
+                        zh.read(zinfos[i].filename),
+                    )
+
                 # make sure the zip file is still valid
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
@@ -109,18 +126,29 @@ class AbstractCopyTests(RepackHelperMixin):
             with self.subTest(i=i, filename=self.test_files[i][0]):
                 zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
                 with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-                    zi_new = ('file.txt', zh.start_dir, *zinfos[i][2:])
+                    zi_new = {
+                        **ComparableZipInfo(zinfos[i]),
+                        'filename': 'file.txt',
+                        'orig_filename': 'file.txt',
+                        'header_offset': zh.start_dir,
+                    }
                     zh.copy(zh.infolist()[i], 'file.txt')
 
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [*(zi for j, zi in enumerate(zinfos)), zi_new],
+                        [*(ComparableZipInfo(zi) for zi in zinfos), zi_new],
                     )
 
                     # check NameToInfo cache
                     self.assertEqual(ComparableZipInfo(zh.getinfo('file.txt')), zi_new)
 
+                    # check content
+                    self.assertEqual(
+                        zh.read(zi_new['filename']),
+                        zh.read(zinfos[i].filename),
+                    )
+
                 # make sure the zip file is still valid
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
@@ -130,18 +158,29 @@ class AbstractCopyTests(RepackHelperMixin):
             with self.subTest(i=i, filename=self.test_files[i][0]):
                 zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files, force_zip64=True)
                 with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-                    zi_new = ('file.txt', zh.start_dir, *zinfos[i][2:])
+                    zi_new = {
+                        **ComparableZipInfo(zinfos[i]),
+                        'filename': 'file.txt',
+                        'orig_filename': 'file.txt',
+                        'header_offset': zh.start_dir,
+                    }
                     zh.copy(self.test_files[i][0], 'file.txt')
 
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [*(zi for j, zi in enumerate(zinfos)), zi_new],
+                        [*(ComparableZipInfo(zi) for zi in zinfos), zi_new],
                     )
 
                     # check NameToInfo cache
                     self.assertEqual(ComparableZipInfo(zh.getinfo('file.txt')), zi_new)
 
+                    # check content
+                    self.assertEqual(
+                        zh.read(zi_new['filename']),
+                        zh.read(zinfos[i].filename),
+                    )
+
                 # make sure the zip file is still valid
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
@@ -152,18 +191,29 @@ class AbstractCopyTests(RepackHelperMixin):
                 with open(TESTFN, 'wb') as fh:
                     zinfos = self._prepare_zip_from_test_files(Unseekable(fh), self.test_files)
                 with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-                    zi_new = ('file.txt', zh.start_dir, *zinfos[i][2:])
+                    zi_new = {
+                        **ComparableZipInfo(zinfos[i]),
+                        'filename': 'file.txt',
+                        'orig_filename': 'file.txt',
+                        'header_offset': zh.start_dir,
+                    }
                     zh.copy(self.test_files[i][0], 'file.txt')
 
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [*(zi for j, zi in enumerate(zinfos)), zi_new],
+                        [*(ComparableZipInfo(zi) for zi in zinfos), zi_new],
                     )
 
                     # check NameToInfo cache
                     self.assertEqual(ComparableZipInfo(zh.getinfo('file.txt')), zi_new)
 
+                    # check content
+                    self.assertEqual(
+                        zh.read(zi_new['filename']),
+                        zh.read(zinfos[i].filename),
+                    )
+
                 # make sure the zip file is still valid
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
@@ -173,18 +223,29 @@ class AbstractCopyTests(RepackHelperMixin):
             with self.subTest(i=i, filename=self.test_files[i][0]):
                 zinfos = self._prepare_zip_from_test_files(TESTFN, self.test_files)
                 with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-                    zi_new = ('file2.txt', zh.start_dir, *zinfos[i][2:])
+                    zi_new = {
+                        **ComparableZipInfo(zinfos[i]),
+                        'filename': 'file2.txt',
+                        'orig_filename': 'file2.txt',
+                        'header_offset': zh.start_dir,
+                    }
                     zh.copy(self.test_files[i][0], 'file2.txt')
 
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [*(zi for j, zi in enumerate(zinfos)), zi_new],
+                        [*(ComparableZipInfo(zi) for zi in zinfos), zi_new],
                     )
 
                     # check NameToInfo cache
                     self.assertEqual(ComparableZipInfo(zh.getinfo('file2.txt')), zi_new)
 
+                    # check content
+                    self.assertEqual(
+                        zh.read(zi_new['filename']),
+                        zh.read(zinfos[i].filename),
+                    )
+
                 # make sure the zip file is still valid
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
@@ -222,44 +283,63 @@ class AbstractCopyTests(RepackHelperMixin):
         with zipfile.ZipFile(TESTFN, 'w') as zh:
             for file, data in self.test_files:
                 zh.writestr(file, data)
-            zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
-
-            zi_new = ('file.txt', zh.start_dir, *zinfos[0][2:])
+            zinfos = list(zh.infolist())
+
+            zi_new = {
+                **ComparableZipInfo(zinfos[0]),
+                'filename': 'file.txt',
+                'orig_filename': 'file.txt',
+                'header_offset': zh.start_dir,
+            }
             zh.copy(zh.infolist()[0], 'file.txt')
 
             # check infolist
             self.assertEqual(
                 [ComparableZipInfo(zi) for zi in zh.infolist()],
-                [*(zi for j, zi in enumerate(zinfos)), zi_new],
+                [*(ComparableZipInfo(zi) for zi in zinfos), zi_new],
             )
 
             # check NameToInfo cache
             self.assertEqual(ComparableZipInfo(zh.getinfo('file.txt')), zi_new)
-            zh.remove(self.test_files[0][0])
+
+            # check content
+            self.assertEqual(
+                zh.read(zi_new['filename']),
+                zh.read(zinfos[0].filename),
+            )
 
         # make sure the zip file is still valid
         with zipfile.ZipFile(TESTFN) as zh:
             self.assertIsNone(zh.testzip())
 
     def test_copy_mode_x(self):
-        unlink(TESTFN)
         with zipfile.ZipFile(TESTFN, 'x') as zh:
             for file, data in self.test_files:
                 zh.writestr(file, data)
-            zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
-
-            zi_new = ('file.txt', zh.start_dir, *zinfos[0][2:])
+            zinfos = list(zh.infolist())
+
+            zi_new = {
+                **ComparableZipInfo(zinfos[0]),
+                'filename': 'file.txt',
+                'orig_filename': 'file.txt',
+                'header_offset': zh.start_dir,
+            }
             zh.copy(zh.infolist()[0], 'file.txt')
 
             # check infolist
             self.assertEqual(
                 [ComparableZipInfo(zi) for zi in zh.infolist()],
-                [*(zi for j, zi in enumerate(zinfos)), zi_new],
+                [*(ComparableZipInfo(zi) for zi in zinfos), zi_new],
             )
 
             # check NameToInfo cache
             self.assertEqual(ComparableZipInfo(zh.getinfo('file.txt')), zi_new)
-            zh.remove(self.test_files[0][0])
+
+            # check content
+            self.assertEqual(
+                zh.read(zi_new['filename']),
+                zh.read(zinfos[0].filename),
+            )
 
         # make sure the zip file is still valid
         with zipfile.ZipFile(TESTFN) as zh:
@@ -302,7 +382,7 @@ class AbstractRemoveTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [zi for j, zi in enumerate(zinfos) if j != i],
+                        [ComparableZipInfo(zi) for j, zi in enumerate(zinfos) if j != i],
                     )
 
                     # check NameToInfo cache
@@ -323,7 +403,7 @@ class AbstractRemoveTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [zi for j, zi in enumerate(zinfos) if j != i],
+                        [ComparableZipInfo(zi) for j, zi in enumerate(zinfos) if j != i],
                     )
 
                     # check NameToInfo cache
@@ -364,13 +444,13 @@ class AbstractRemoveTests(RepackHelperMixin):
                 # check infolist
                 self.assertEqual(
                     [ComparableZipInfo(zi) for zi in zh.infolist()],
-                    [zinfos[0], zinfos[2]],
+                    [ComparableZipInfo(zi) for zi in [zinfos[0], zinfos[2]]],
                 )
 
                 # check NameToInfo cache
                 self.assertEqual(
                     ComparableZipInfo(zh.getinfo('file.txt')),
-                    zinfos[0],
+                    ComparableZipInfo(zinfos[0]),
                 )
 
             # make sure the zip file is still valid
@@ -385,7 +465,7 @@ class AbstractRemoveTests(RepackHelperMixin):
                 # check infolist
                 self.assertEqual(
                     [ComparableZipInfo(zi) for zi in zh.infolist()],
-                    [zinfos[2]],
+                    [ComparableZipInfo(zi) for zi in [zinfos[2]]],
                 )
 
                 # check NameToInfo cache
@@ -414,13 +494,13 @@ class AbstractRemoveTests(RepackHelperMixin):
                 # check infolist
                 self.assertEqual(
                     [ComparableZipInfo(zi) for zi in zh.infolist()],
-                    [zinfos[1], zinfos[2]],
+                    [ComparableZipInfo(zi) for zi in [zinfos[1], zinfos[2]]],
                 )
 
                 # check NameToInfo cache
                 self.assertEqual(
                     ComparableZipInfo(zh.getinfo('file.txt')),
-                    zinfos[1],
+                    ComparableZipInfo(zinfos[1]),
                 )
 
             # make sure the zip file is still valid
@@ -434,13 +514,13 @@ class AbstractRemoveTests(RepackHelperMixin):
                 # check infolist
                 self.assertEqual(
                     [ComparableZipInfo(zi) for zi in zh.infolist()],
-                    [zinfos[0], zinfos[2]],
+                    [ComparableZipInfo(zi) for zi in [zinfos[0], zinfos[2]]],
                 )
 
                 # check NameToInfo cache
                 self.assertEqual(
                     ComparableZipInfo(zh.getinfo('file.txt')),
-                    zinfos[0],
+                    ComparableZipInfo(zinfos[0]),
                 )
 
             # make sure the zip file is still valid
@@ -456,7 +536,7 @@ class AbstractRemoveTests(RepackHelperMixin):
                 # check infolist
                 self.assertEqual(
                     [ComparableZipInfo(zi) for zi in zh.infolist()],
-                    [zinfos[2]],
+                    [ComparableZipInfo(zi) for zi in [zinfos[2]]],
                 )
 
                 # check NameToInfo cache
@@ -478,7 +558,7 @@ class AbstractRemoveTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        [zi for j, zi in enumerate(zinfos) if j != i],
+                        [ComparableZipInfo(zi) for j, zi in enumerate(zinfos) if j != i],
                     )
 
                     # check NameToInfo cache
@@ -513,14 +593,14 @@ class AbstractRemoveTests(RepackHelperMixin):
         with zipfile.ZipFile(TESTFN, 'w') as zh:
             for file, data in self.test_files:
                 zh.writestr(file, data)
-            zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
+            zinfos = list(zh.infolist())
 
             zh.remove(self.test_files[0][0])
 
             # check infolist
             self.assertEqual(
                 [ComparableZipInfo(zi) for zi in zh.infolist()],
-                [zinfos[1], zinfos[2]],
+                [ComparableZipInfo(zi) for zi in [zinfos[1], zinfos[2]]],
             )
 
             # check NameToInfo cache
@@ -535,14 +615,14 @@ class AbstractRemoveTests(RepackHelperMixin):
         with zipfile.ZipFile(TESTFN, 'x') as zh:
             for file, data in self.test_files:
                 zh.writestr(file, data)
-            zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
+            zinfos = list(zh.infolist())
 
             zh.remove(self.test_files[0][0])
 
             # check infolist
             self.assertEqual(
                 [ComparableZipInfo(zi) for zi in zh.infolist()],
-                [zinfos[1], zinfos[2]],
+                [ComparableZipInfo(zi) for zi in [zinfos[1], zinfos[2]]],
             )
 
             # check NameToInfo cache
@@ -601,7 +681,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -616,27 +696,20 @@ class AbstractRepackTests(RepackHelperMixin):
         self._prepare_zip_from_test_files(TESTFN, self.test_files)
 
         with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-            zi = zh.remove(zh.infolist()[0])
-            with mock.patch.object(zipfile._ZipRepacker, 'repack') as m_rp:
+            with mock.patch.object(zipfile._ZipRepacker, 'repack') as m_rp, \
+                 mock.patch.object(zipfile, '_ZipRepacker', wraps=zipfile._ZipRepacker) as m_zr:
                 zh.repack()
+        m_zr.assert_called_once_with()
         m_rp.assert_called_once_with(zh, None)
 
         with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
             zi = zh.remove(zh.infolist()[0])
-            with mock.patch.object(zipfile._ZipRepacker, 'repack') as m_rp:
-                zh.repack([zi])
+            with mock.patch.object(zipfile._ZipRepacker, 'repack') as m_rp, \
+                 mock.patch.object(zipfile, '_ZipRepacker', wraps=zipfile._ZipRepacker) as m_zr:
+                zh.repack([zi], strict_descriptor=True, chunk_size=1024)
+        m_zr.assert_called_once_with(strict_descriptor=True, chunk_size=1024)
         m_rp.assert_called_once_with(zh, [zi])
 
-        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-            with mock.patch.object(zipfile, '_ZipRepacker') as m_rp:
-                zh.repack()
-        m_rp.assert_called_once_with()
-
-        with zipfile.ZipFile(TESTFN, 'a', self.compression) as zh:
-            with mock.patch.object(zipfile, '_ZipRepacker') as m_rp:
-                zh.repack(strict_descriptor=True, chunk_size=1024)
-        m_rp.assert_called_once_with(strict_descriptor=True, chunk_size=1024)
-
     def test_repack_bytes_before_first_file(self):
         """Should preserve random bytes before the first recorded local file entry."""
         for ii in ([], [0], [0, 1], [0, 1, 2]):
@@ -660,7 +733,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -694,7 +767,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -740,7 +813,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -750,6 +823,7 @@ class AbstractRepackTests(RepackHelperMixin):
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
 
+    @mock.patch.object(time, 'time', new=lambda: 315504000)  # fix time for ZipFile.writestr()
     def test_repack_bytes_before_removed_files(self):
         """Should preserve if there are bytes before stale local file entries."""
         for ii in ([1], [1, 2], [2]):
@@ -764,7 +838,7 @@ class AbstractRepackTests(RepackHelperMixin):
                             zh.writestr(file, data)
                         for i in ii:
                             zh.remove(self.test_files[i][0])
-                        expected_zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
+                        expected_zinfos = list(zh.infolist())
                 expected_size = os.path.getsize(TESTFN)
 
                 # do the removal and check the result
@@ -783,7 +857,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -793,6 +867,7 @@ class AbstractRepackTests(RepackHelperMixin):
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
 
+    @mock.patch.object(time, 'time', new=lambda: 315504000)  # fix time for ZipFile.writestr()
     def test_repack_bytes_after_removed_files(self):
         """Should keep extra bytes if there are bytes after stale local file entries."""
         for ii in ([1], [1, 2], [2]):
@@ -806,7 +881,7 @@ class AbstractRepackTests(RepackHelperMixin):
                             if i == ii[-1]:
                                 fh.write(b' dummy bytes ')
                                 zh.start_dir = fh.tell()
-                        expected_zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
+                        expected_zinfos = list(zh.infolist())
                 expected_size = os.path.getsize(TESTFN)
 
                 # do the removal and check the result
@@ -825,7 +900,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -835,6 +910,7 @@ class AbstractRepackTests(RepackHelperMixin):
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
 
+    @mock.patch.object(time, 'time', new=lambda: 315504000)  # fix time for ZipFile.writestr()
     def test_repack_bytes_between_removed_files(self):
         """Should strip only local file entries before random bytes."""
         # calculate the expected results
@@ -845,7 +921,7 @@ class AbstractRepackTests(RepackHelperMixin):
                 zh.start_dir = fh.tell()
                 zh.writestr(*self.test_files[2])
                 zh.remove(self.test_files[2][0])
-                expected_zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
+                expected_zinfos = list(zh.infolist())
         expected_size = os.path.getsize(TESTFN)
 
         # do the removal and check the result
@@ -864,7 +940,7 @@ class AbstractRepackTests(RepackHelperMixin):
             # check infolist
             self.assertEqual(
                 [ComparableZipInfo(zi) for zi in zh.infolist()],
-                expected_zinfos,
+                [ComparableZipInfo(zi) for zi in expected_zinfos],
             )
 
         # check file size
@@ -886,7 +962,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     fh.write(b'dummy ')
                     fh.write(fz.read())
                 with zipfile.ZipFile(TESTFN) as zh:
-                    expected_zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
+                    expected_zinfos = list(zh.infolist())
                 expected_size = os.path.getsize(TESTFN)
 
                 # do the removal and check the result
@@ -904,7 +980,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -949,7 +1025,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -992,20 +1068,20 @@ class AbstractRepackTests(RepackHelperMixin):
                 with zipfile.ZipFile(TESTFN) as zh:
                     self.assertIsNone(zh.testzip())
 
+    @mock.patch.object(time, 'time', new=lambda: 315504000)  # fix time for ZipFile.writestr()
     def test_repack_removed_bytes_between_files(self):
         """Should not remove bytes between local file entries."""
         for ii in ([0], [1], [2]):
             with self.subTest(removed=ii):
                 # calculate the expected results
-                expected_zinfos = []
                 with open(TESTFN, 'wb') as fh:
                     with zipfile.ZipFile(fh, 'w', self.compression) as zh:
                         for j, (file, data) in enumerate(self.test_files):
                             if j not in ii:
                                 zh.writestr(file, data)
-                                expected_zinfos.append(ComparableZipInfo(zh.getinfo(file)))
                             fh.write(b' dummy bytes ')
                             zh.start_dir = fh.tell()
+                        expected_zinfos = list(zh.infolist())
                 expected_size = os.path.getsize(TESTFN)
 
                 # do the removal and check the result
@@ -1022,7 +1098,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -1078,7 +1154,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     fh.write(b'dummy ')
                     fh.write(fz.read())
                 with zipfile.ZipFile(TESTFN) as zh:
-                    expected_zinfos = [ComparableZipInfo(zi) for zi in zh.infolist()]
+                    expected_zinfos = list(zh.infolist())
                 expected_size = os.path.getsize(TESTFN)
 
                 # do the removal and check the result
@@ -1095,7 +1171,7 @@ class AbstractRepackTests(RepackHelperMixin):
                     # check infolist
                     self.assertEqual(
                         [ComparableZipInfo(zi) for zi in zh.infolist()],
-                        expected_zinfos,
+                        [ComparableZipInfo(zi) for zi in expected_zinfos],
                     )
 
                 # check file size
@@ -1392,7 +1468,7 @@ class ZipRepackerTests(unittest.TestCase):
         fz = io.BytesIO()
         f = Unseekable(fz) if dd else fz
         cm = (mock.patch.object(struct, 'pack', side_effect=struct_pack_no_dd_sig)
-              if not dd_sig else nullcontext())
+              if not dd_sig else contextlib.nullcontext())
         with zipfile.ZipFile(f, 'w', compression=compression) as zh:
             with cm:
                 with zh.open(arcname, 'w', force_zip64=force_zip64) as fh:

{zipremove-0.4.0 → zipremove-0.5.0}/tests/test_zipfile64.py

@@ -18,16 +18,19 @@ except ImportError:
     # polyfill for Python < 3.12
     from test.test_zipfile import Unseekable, requires_zlib
 
-ENABLED_RESOURCES = set(os.environ.get("TEST_RESOURCES", "").split(","))
-
-def requires(resource_name):
+def requires_resource(res):
+    if not hasattr(requires_resource, '_resources'):
+        requires_resource._resources = set(os.environ.get("TEST_RESOURCES", "").split(","))
     return unittest.skipUnless(
-        resource_name in ENABLED_RESOURCES,
-        f"requires resource: {resource_name!r} (set envvar TEST_RESOURCES)"
+        res in requires_resource._resources,
+        f"requires resource {res!r} in envvar TEST_RESOURCES"
     )
 
+@requires_resource('extralargefile')
+def setUpModule():
+    pass
+
 
-@requires('extralargefile')
 class TestRepack(unittest.TestCase):
     def setUp(self):
         # Create test data.