diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-10-17 16:34:23 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-10-17 16:34:23 -0400 |
| commit | 419087c45b105579f69d8bc729c1aa09eb493c17 (patch) | |
| tree | 88b2c194a60164aa460b378323b450423a7e88ee /setuptools/tests/test_archive_util.py | |
| parent | 38de858e37f9c7a90498ea78c78ed76aca835ad2 (diff) | |
| parent | 898ae04656066d88add9c0a8750f32f938d99716 (diff) | |
| download | python-setuptools-git-419087c45b105579f69d8bc729c1aa09eb493c17.tar.gz | |
Merge branch 'master' into debt/drop-py35
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)) |