aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools
diff options
context:
space:
mode:
authorHugo <hugovk@users.noreply.github.com>2018-04-26 18:14:38 +0300
committerPaul Ganssle <paul@ganssle.io>2018-05-24 14:32:31 -0400
commitca7aa27ceb9370dabbca21b55d6410bb1101f8f0 (patch)
tree650e9c71a98ddd971927710c749eb1e90b184229 /setuptools
parent7392f01ffced3acfdef25b0b2d55cefdc6ee468a (diff)
downloadexternal_python_setuptools-ca7aa27ceb9370dabbca21b55d6410bb1101f8f0.tar.gz
external_python_setuptools-ca7aa27ceb9370dabbca21b55d6410bb1101f8f0.tar.bz2
external_python_setuptools-ca7aa27ceb9370dabbca21b55d6410bb1101f8f0.zip
Remove redundant Python 3.1 code
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/command/easy_install.py3
-rw-r--r--setuptools/py31compat.py14
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