bpo-8901: Windows registry path is now ignored with the -E option (GH-18169)

This commit is contained in:
Zackery Spytz 2020-03-30 10:04:45 -06:00 • committed by GitHub
parent 53e4c91725
commit 676b105111
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions

View file

@ -783,8 +783,11 @@ calculate_module_search_path(PyCalculatePath *calculate,
{
int skiphome = calculate->home==NULL ? 0 : 1;
#ifdef Py_ENABLE_SHARED
calculate->machine_path = getpythonregpath(HKEY_LOCAL_MACHINE, skiphome);
calculate->user_path = getpythonregpath(HKEY_CURRENT_USER, skiphome);
if (!Py_IgnoreEnvironmentFlag) {
calculate->machine_path = getpythonregpath(HKEY_LOCAL_MACHINE,
skiphome);
calculate->user_path = getpythonregpath(HKEY_CURRENT_USER, skiphome);
}
#endif
/* We only use the default relative PYTHONPATH if we haven't
anything better to use! */