Merge tag 'v1.1.1'

Author: jaraco

CHANGES.rst

@@ -1,3 +1,8 @@
+v1.1.1
+======
+
+#43: Restored performance of implicit dir computation.
+
 v2.2.0
 ======
 

setup.cfg

@@ -27,6 +27,7 @@ testing =
 
 	# local
 	jaraco.itertools
+	func-timeout
 
 docs =
 	# upstream

test_zipp.py

@@ -5,8 +5,10 @@
 import unittest
 import tempfile
 import shutil
+import string
 
 import jaraco.itertools
+import func_timeout
 
 import zipp
 
@@ -225,3 +227,8 @@ def test_joinpath_constant_time(self):
             entry.joinpath('suffix')
         # Check the file iterated all items
         assert entries.count == self.HUGE_ZIPFILE_NUM_ENTRIES
+
+    @func_timeout.func_set_timeout(3)
+    def test_implied_dirs_performance(self):
+        data = ['/'.join(string.ascii_lowercase + str(n)) for n in range(10000)]
+        zipp.CompleteDirs._implied_dirs(data)

zipp.py

@@ -57,11 +57,12 @@ class CompleteDirs(zipfile.ZipFile):
     @staticmethod
     def _implied_dirs(names):
         parents = itertools.chain.from_iterable(map(_parents, names))
+        # Cast names to a set for O(1) lookups
+        existing = set(names)
         # Deduplicate entries in original order
         implied_dirs = OrderedDict.fromkeys(
             p + posixpath.sep for p in parents
-            # Cast names to a set for O(1) lookups
-            if p + posixpath.sep not in set(names)
+            if p + posixpath.sep not in existing
         )
         return implied_dirs