bpo-8901: Windows registry path is now ignored with the -E option (GH-18169)
This commit is contained in:
parent
53e4c91725
commit
676b105111
|
@ -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
|
||||
==========
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Ignore the Windows registry when the ``-E`` option is used.
|
|
@ -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! */
|
||||
|
|
Loading…
Reference in New Issue