Update ContextualZipFile to use a single constructor

2 files changed, 10 insertions, 12 deletions

diff --git a/ez_setup.py b/ez_setup.py
index 53350e45..df3848a3 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -80,14 +80,13 @@ class ContextualZipFile(zipfile.ZipFile):
     def __exit__(self, type, value, traceback):
         self.close()
 
-    @classmethod
-    def compat(cls, *args, **kwargs):
+    def __new__(cls, *args, **kwargs):
         """
         Construct a ZipFile or ContextualZipFile as appropriate
         """
-        zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
-        class_ = zipfile.ZipFile if zf_has_exit else cls
-        return class_(*args, **kwargs)
+        if hasattr(zipfile.ZipFile, '__exit__'):
+            return zipfile.ZipFile(*args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
 
 
 @contextlib.contextmanager
@@ -98,7 +97,7 @@ def archive_context(filename):
     old_wd = os.getcwd()
     try:
         os.chdir(tmpdir)
-        with ContextualZipFile.compat(filename) as archive:
+        with ContextualZipFile(filename) as archive:
             archive.extractall()
 
         # going in the directory
diff --git a/pkg_resources.py b/pkg_resources.py
index 4c28d72c..1f8c3183 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1551,7 +1551,7 @@ def build_zipmanifest(path):
       * [7] - zipinfo.CRC
     """
     zipinfo = dict()
-    with ContextualZipFile.compat(path) as zfile:
+    with ContextualZipFile(path) as zfile:
         for zitem in zfile.namelist():
             zpath = zitem.replace('/', os.sep)
             zipinfo[zpath] = zfile.getinfo(zitem)
@@ -1570,14 +1570,13 @@ class ContextualZipFile(zipfile.ZipFile):
     def __exit__(self, type, value, traceback):
         self.close()
 
-    @classmethod
-    def compat(cls, *args, **kwargs):
+    def __new__(cls, *args, **kwargs):
         """
         Construct a ZipFile or ContextualZipFile as appropriate
         """
-        zf_has_exit = hasattr(zipfile.ZipFile, '__exit__')
-        class_ = zipfile.ZipFile if zf_has_exit else cls
-        return class_(*args, **kwargs)
+        if hasattr(zipfile.ZipFile, '__exit__'):
+            return zipfile.ZipFile(*args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls, *args, **kwargs)
 
 
 class ZipProvider(EggProvider):