diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-08-18 04:01:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-08-18 04:01:33 (GMT) |
| commit | c5847414f9e46ccac42689196e5656b1be0dc957 (patch) | |
| tree | ea76f55dcd27d87303b4bcfa83ecc7cf4760fdf9 | |
| parent | 049e509a9f87d1f82ae0ebfe21c226f37ce9fbdb (diff) | |
| parent | 0c56bb97ea48d5a86af098e9ea1df996a53b6cf8 (diff) | |
| download | cpython-c5847414f9e46ccac42689196e5656b1be0dc957.zip cpython-c5847414f9e46ccac42689196e5656b1be0dc957.tar.gz cpython-c5847414f9e46ccac42689196e5656b1be0dc957.tar.bz2 | |
merge 3.4 (closes #22200)
| -rw-r--r-- | Lib/distutils/command/install.py | 37 |
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': { |