zipremove 0.4.0__tar.gz → 0.4.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zipremove
-Version: 0.4.0
+Version: 0.4.1
 Summary: Extend `zipfile` with `remove`-related functionalities
 Home-page: https://github.com/danny0838/zipremove
 Author: Danny Lin

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

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

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

@@ -262,14 +262,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(
@@ -380,8 +377,8 @@ class _ZipRepacker:
         if pos > end_offset:
             return None
 
+        # parse zip64
         try:
-            # parse zip64
             try:
                 zinfo._decodeExtra(crc32(filename))
             except TypeError:
@@ -617,15 +614,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.4.1/src/zipremove.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zipremove
-Version: 0.4.0
+Version: 0.4.1
 Summary: Extend `zipfile` with `remove`-related functionalities
 Home-page: https://github.com/danny0838/zipremove
 Author: Danny Lin

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

@@ -1,3 +1,4 @@
+import contextlib
 import io
 import itertools
 import os
@@ -6,7 +7,6 @@ import sys
 import unittest
 import unittest.mock as mock
 import warnings
-from contextlib import nullcontext
 
 import zipremove as zipfile
 
@@ -616,27 +616,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]):
@@ -1392,7 +1385,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.4.1}/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.