Merge with 3.5

2015-07-17 11:59:57 -07:00 · 2015-07-17 11:59:57 -07:00 · 6160b357b9
parent eaf3ca891f af75a54193
commit 6160b357b9
2 changed files with 6 additions and 0 deletions
--- a/Doc/using/win_installer.png
+++ b/Doc/using/win_installer.png
--- a/Lib/site.py
+++ b/Lib/site.py
@ -476,6 +476,12 @@ def venv(known_paths):
                        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