diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
| commit | fc4d9828768ceebd2f9337481450c88376c013e9 (patch) | |
| tree | 6dff622c50739ca19fdfbecf1008a42589d37b57 /setuptools/tests/test_archive_util.py | |
| parent | 7bb73a477de24069002516eb6eb1d755bed9d65b (diff) | |
| parent | 03d36b9edb53e266a0b4b836e1e3178f989a0781 (diff) | |
| download | python-setuptools-git-feature/implicit-bootstrap.tar.gz | |
Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap
Diffstat (limited to 'setuptools/tests/test_archive_util.py')
| -rw-r--r-- | setuptools/tests/test_archive_util.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/setuptools/tests/test_archive_util.py b/setuptools/tests/test_archive_util.py index b789e9ac..7f996244 100644 --- a/setuptools/tests/test_archive_util.py +++ b/setuptools/tests/test_archive_util.py @@ -3,8 +3,6 @@ import tarfile import io -from setuptools.extern import six - import pytest from setuptools import archive_util @@ -22,8 +20,6 @@ def tarfile_with_unicode(tmpdir): data = b"" filename = "testimàˆge.png" - if six.PY2: - filename = filename.decode('utf-8') t = tarfile.TarInfo(filename) t.size = len(data) @@ -39,4 +35,4 @@ def tarfile_with_unicode(tmpdir): @pytest.mark.xfail(reason="#710 and #712") def test_unicode_files(tarfile_with_unicode, tmpdir): target = tmpdir / 'out' - archive_util.unpack_archive(tarfile_with_unicode, six.text_type(target)) + archive_util.unpack_archive(tarfile_with_unicode, str(target)) |