diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-08-01 23:02:27 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-08-01 23:02:27 -0400 |
commit | f9b2902f312834ca6676f0b79bedf845c2bc42c3 (patch) | |
tree | 4d666185bcf57773baff5b6052388c98a06e7eaf /setuptools/archive_util.py | |
parent | 12dc2c65240bb6d609db30a56dbb1fe217771a17 (diff) | |
download | python-setuptools-git-f9b2902f312834ca6676f0b79bedf845c2bc42c3.tar.gz |
_extract_member needs final_dst to be a native string. Ref #710.
Diffstat (limited to 'setuptools/archive_util.py')
-rwxr-xr-x | setuptools/archive_util.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py index a1960be8..6493b448 100755 --- a/setuptools/archive_util.py +++ b/setuptools/archive_util.py @@ -8,6 +8,8 @@ import posixpath import contextlib from distutils.errors import DistutilsError +from setuptools.extern import six + from pkg_resources import ensure_directory, ContextualZipFile @@ -164,6 +166,8 @@ 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) |