aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/archive_util.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-08-02 08:55:32 -0400
committerJason R. Coombs <jaraco@jaraco.com>2016-08-02 08:55:32 -0400
commit27e455c506748ad119813f2f8a23d1cc13726100 (patch)
tree13dd1290eff116dc869b129f07f99699e73d7f63 /setuptools/archive_util.py
parentd12b01679cb0e2e6a3ea1832891614c6ee86095c (diff)
downloadexternal_python_setuptools-27e455c506748ad119813f2f8a23d1cc13726100.tar.gz
external_python_setuptools-27e455c506748ad119813f2f8a23d1cc13726100.tar.bz2
external_python_setuptools-27e455c506748ad119813f2f8a23d1cc13726100.zip
Backout f9b2902f312. Reopens #710.
Diffstat (limited to 'setuptools/archive_util.py')
-rwxr-xr-xsetuptools/archive_util.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index 16355092..b6411cc5 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -8,8 +8,6 @@ import posixpath
import contextlib
from distutils.errors import DistutilsError
-from setuptools.extern import six
-
from pkg_resources import ensure_directory, ContextualZipFile
@@ -164,8 +162,6 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
if final_dst:
if final_dst.endswith(os.sep):
final_dst = final_dst[:-1]
- if six.PY2:
- final_dst = final_dst.encode(tarfile.ENCODING)
try:
# XXX Ugh
tarobj._extract_member(member, final_dst)