From 676b105111e2399ed400cd13ab113f9aa891760d Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Mon, 30 Mar 2020 10:04:45 -0600 Subject: [PATCH] bpo-8901: Windows registry path is now ignored with the -E option (GH-18169) --- Doc/whatsnew/3.9.rst | 5 +++++ .../next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst | 1 + PC/getpathp.c | 7 +++++-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst index f58bcbcd3ce..59083da3a26 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -548,6 +548,11 @@ Build and C API Changes * The :c:func:`PyModule_AddType` function is added to help adding a type to a module. (Contributed by Dong-hee Na in :issue:`40024`.) +* The Windows registry is no longer used to initialize :data:`sys.path` when + the ``-E`` option is used. This is significant when embedding Python on + Windows. + (Contributed by Zackery Spytz in :issue:`8901`.) + Deprecated ========== diff --git a/Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst b/Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst new file mode 100644 index 00000000000..1d452cf2629 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-01-24-09-15-41.bpo-8901.hVnhGO.rst @@ -0,0 +1 @@ +Ignore the Windows registry when the ``-E`` option is used. diff --git a/PC/getpathp.c b/PC/getpathp.c index 7a2c1fd6fe6..aa820e57a9c 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -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! */