summaryrefslogtreecommitdiff
path: root/setuptools/archive_util.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-11-20 13:12:05 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-11-20 13:12:05 -0500
commit89ef5bb7e4812193d6f593d531bad36191517981 (patch)
tree1c5dccb410d9a740d1461cd07249af4c233ad120 /setuptools/archive_util.py
parent45ec75beccba6432b3ed7b80fd84b65276453e9d (diff)
parentc6fe76cbc22ac6ac64709a0381a6ce48a8c9884a (diff)
downloadpython-setuptools-git-89ef5bb7e4812193d6f593d531bad36191517981.tar.gz
Drop support for Python 2.6 by merging the drop-py26 branch. Fixes #878.
Diffstat (limited to 'setuptools/archive_util.py')
-rwxr-xr-xsetuptools/archive_util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index cc82b3da..81436044 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -8,7 +8,7 @@ import posixpath
import contextlib
from distutils.errors import DistutilsError
-from pkg_resources import ensure_directory, ContextualZipFile
+from pkg_resources import ensure_directory
__all__ = [
"unpack_archive", "unpack_zipfile", "unpack_tarfile", "default_filter",
@@ -98,7 +98,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
if not zipfile.is_zipfile(filename):
raise UnrecognizedFormat("%s is not a zip file" % (filename,))
- with ContextualZipFile(filename) as z:
+ with zipfile.ZipFile(filename) as z:
for info in z.infolist():
name = info.filename