diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-17 11:59:57 -0700 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-17 11:59:57 -0700 |
| commit | 6160b357b927c3cf9e86b43df7f68d066f68721b (patch) | |
| tree | bffde864467bcc8cbc7c58a04b7d91c0c9056abc | |
| parent | eaf3ca891f978df1c857feac56793aee0708554c (diff) | |
| parent | af75a54193891384b19ebdf1f26cbcf965717a10 (diff) | |
| download | cpython-git-6160b357b927c3cf9e86b43df7f68d066f68721b.tar.gz | |
Merge with 3.5
| -rw-r--r-- | Doc/using/win_installer.png | bin | 48953 -> 48994 bytes | |||
| -rw-r--r-- | 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 Binary files differindex e5d5e07a14..00c88a830f 100644 --- a/Doc/using/win_installer.png +++ b/Doc/using/win_installer.png diff --git a/Lib/site.py b/Lib/site.py index b7d0331fa7..6f66c07de5 100644 --- 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 |
