aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/command/easy_install.py3
-rw-r--r--setuptools/tests/test_easy_install.py6
2 files changed, 5 insertions, 4 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 03dd6768..7d982d89 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -666,6 +666,9 @@ class easy_install(Command):
finally:
if os.path.exists(tmpdir):
+ # workaround for http://bugs.python.org/issue24672
+ if six.PY2:
+ tmpdir = six.u(tmpdir)
rmtree(tmpdir)
def install_item(self, spec, download, tmpdir, deps, install_needed=False):
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 209e6b78..08138efc 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -169,10 +169,8 @@ class TestEasyInstallTest:
sdist_zip.close()
return str(sdist)
- @pytest.mark.xfail(reason="#709 and #710")
- # also
- #@pytest.mark.xfail(setuptools.tests.is_ascii,
- # reason="https://github.com/pypa/setuptools/issues/706")
+ @pytest.mark.xfail(setuptools.tests.is_ascii,
+ reason="https://github.com/pypa/setuptools/issues/706")
def test_unicode_filename_in_sdist(self, sdist_unicode, tmpdir, monkeypatch):
"""
The install command should execute correctly even if