diff options
| -rwxr-xr-x | setuptools/command/easy_install.py | 3 | ||||
| -rw-r--r-- | setuptools/py31compat.py | 14 |
2 files changed, 2 insertions, 15 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 85ee40f1..a059a0bd 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -40,12 +40,13 @@ import subprocess import shlex import io +from sysconfig import get_config_vars, get_path + from setuptools.extern import six from setuptools.extern.six.moves import configparser, map from setuptools import Command from setuptools.sandbox import run_setup -from setuptools.py31compat import get_path, get_config_vars from setuptools.py27compat import rmtree_safe from setuptools.command import setopt from setuptools.archive_util import unpack_archive diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py index 4ea95320..12895cd8 100644 --- a/setuptools/py31compat.py +++ b/setuptools/py31compat.py @@ -1,17 +1,3 @@ -__all__ = ['get_config_vars', 'get_path'] - -try: - # Python 2.7 or >=3.2 - from sysconfig import get_config_vars, get_path -except ImportError: - from distutils.sysconfig import get_config_vars, get_python_lib - - def get_path(name): - if name not in ('platlib', 'purelib'): - raise ValueError("Name must be purelib or platlib") - return get_python_lib(name == 'platlib') - - try: # Python >=3.2 from tempfile import TemporaryDirectory |