[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[steve.dower]

https://hg.python.org/cpython/rev/b2a1fe8f1b11
changeset:   96933:b2a1fe8f1b11
parent:      96930:c635242ca3f0
parent:      96932:efac259881a9
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Jul 17 11:59:57 2015 -0700
summary:
  Merge with 3.5

files:
  Doc/using/win_installer.png |  Bin 
  Lib/site.py                 |    6 ++++++
  2 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Doc/using/win_installer.png b/Doc/using/win_installer.png
index e5d5e07a1433bc0b9c7ed8929cc8d95437249855..00c88a830febd622082fae5a2c93657586b96fde
GIT binary patch
[stripped]
diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -476,6 +476,12 @@
                         system_site = value.lower()
                     elif key == 'home':
                         sys._home = value
+                    elif key == 'applocal' and value.lower() == 'true':
+                        # App-local installs use the exe_dir as prefix,
+                        # not one level higher, and do not use system
+                        # site packages.
+                        site_prefix = exe_dir
+                        system_site = 'false'
 
         sys.prefix = sys.exec_prefix = site_prefix
 

-- 
Repository URL: https://hg.python.org/cpython