diff options
| author | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-08-16 12:34:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-16 12:34:46 +0000 |
| commit | f991fbb3c9d0e10a0a78ae2b508b3fd99f9cdef2 (patch) | |
| tree | a044b31a3276cc4a51b7fc23776a32b380562bad /setuptools/installer.py | |
| parent | 4eb5b32f8d8bb1e20907028a516346e2b1901391 (diff) | |
| parent | 45e0ea0ff10a64f315a5c65b6805327222e5b565 (diff) | |
| download | python-setuptools-git-f991fbb3c9d0e10a0a78ae2b508b3fd99f9cdef2.tar.gz | |
Merge pull request #2332 from pypa/debt/cleanup-py2
Remove legacy Python 2 code
Diffstat (limited to 'setuptools/installer.py')
| -rw-r--r-- | setuptools/installer.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/setuptools/installer.py b/setuptools/installer.py index e5acec27..e630b874 100644 --- a/setuptools/installer.py +++ b/setuptools/installer.py @@ -2,20 +2,18 @@ import glob import os import subprocess import sys +import tempfile from distutils import log from distutils.errors import DistutilsError import pkg_resources from setuptools.command.easy_install import easy_install -from setuptools.extern import six from setuptools.wheel import Wheel -from .py31compat import TemporaryDirectory - def _fixup_find_links(find_links): """Ensure find-links option end-up being a list of strings.""" - if isinstance(find_links, six.string_types): + if isinstance(find_links, str): return find_links.split() assert isinstance(find_links, (tuple, list)) return find_links @@ -103,7 +101,7 @@ def fetch_build_egg(dist, req): for egg_dist in pkg_resources.find_distributions(eggs_dir): if egg_dist in req and environment.can_add(egg_dist): return egg_dist - with TemporaryDirectory() as tmpdir: + with tempfile.TemporaryDirectory() as tmpdir: cmd = [ sys.executable, '-m', 'pip', '--disable-pip-version-check', |
