summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-08-18 04:00:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-08-18 04:00:42 (GMT)
commit0c56bb97ea48d5a86af098e9ea1df996a53b6cf8 (patch)
treed67d7f5ac1d4f58bd5287fea7013360b556e0a1d /Lib/distutils
parentd9e9528818ca54831a64a624a59b4e9d74d2ef4e (diff)
downloadcpython-0c56bb97ea48d5a86af098e9ea1df996a53b6cf8.zip
cpython-0c56bb97ea48d5a86af098e9ea1df996a53b6cf8.tar.gz
cpython-0c56bb97ea48d5a86af098e9ea1df996a53b6cf8.tar.bz2
remove 2.2 and 2.6 compat code (closes #22200)
Patch from Thomas Kluyver.
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/command/install.py37
1 files changed, 11 insertions, 26 deletions
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 456511c..d768dc5 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -15,32 +15,17 @@ from distutils.util import convert_path, subst_vars, change_root
from distutils.util import get_platform
from distutils.errors import DistutilsOptionError
-# this keeps compatibility from 2.3 to 2.5
-if sys.version < "2.6":
- USER_BASE = None
- USER_SITE = None
- HAS_USER_SITE = False
-else:
- from site import USER_BASE
- from site import USER_SITE
- HAS_USER_SITE = True
-
-if sys.version < "2.2":
- WINDOWS_SCHEME = {
- 'purelib': '$base',
- 'platlib': '$base',
- 'headers': '$base/Include/$dist_name',
- 'scripts': '$base/Scripts',
- 'data' : '$base',
- }
-else:
- WINDOWS_SCHEME = {
- 'purelib': '$base/Lib/site-packages',
- 'platlib': '$base/Lib/site-packages',
- 'headers': '$base/Include/$dist_name',
- 'scripts': '$base/Scripts',
- 'data' : '$base',
- }
+from site import USER_BASE
+from site import USER_SITE
+HAS_USER_SITE = True
+
+WINDOWS_SCHEME = {
+ 'purelib': '$base/Lib/site-packages',
+ 'platlib': '$base/Lib/site-packages',
+ 'headers': '$base/Include/$dist_name',
+ 'scripts': '$base/Scripts',
+ 'data' : '$base',
+}
INSTALL_SCHEMES = {
'unix_prefix': {