mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (closes #22200)

Browse source
This commit is contained in:
Benjamin Peterson 2014-08-17 23:01:33 -05:00
commit c5847414f9
1 changed files with 10 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Lib/distutils/command/install.py
View file

@ -15,32 +15,17 @@ from distutils.util import convert_path, subst_vars, change_root
from distutils.util import get_platform from distutils.util import get_platform
from distutils.errors import DistutilsOptionError from distutils.errors import DistutilsOptionError
# this keeps compatibility from 2.3 to 2.5 from site import USER_BASE
if sys.version < "2.6": from site import USER_SITE
USER_BASE = None HAS_USER_SITE = True
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 = {
WINDOWS_SCHEME = { 'purelib': '$base/Lib/site-packages',
'purelib': '$base', 'platlib': '$base/Lib/site-packages',
'platlib': '$base', 'headers': '$base/Include/$dist_name',
'headers': '$base/Include/$dist_name', 'scripts': '$base/Scripts',
'scripts': '$base/Scripts', 'data' : '$base',
'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',
}
INSTALL_SCHEMES = { INSTALL_SCHEMES = {
'unix_prefix': { 'unix_prefix': {