mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-08 05:39:34 +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

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

@ -15,25 +15,10 @@ 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
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_BASE
from site import USER_SITE from site import USER_SITE
HAS_USER_SITE = True 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 = { WINDOWS_SCHEME = {
'purelib': '$base/Lib/site-packages', 'purelib': '$base/Lib/site-packages',
'platlib': '$base/Lib/site-packages', 'platlib': '$base/Lib/site-packages',