languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-07-20 09:45:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

bpo-38234: Fix PyConfig_Read() when Py_SetPath() was called (GH-16298)

Browse source 
* If Py_SetPath() has been called, _PyConfig_InitPathConfig() now
  uses its value.
* Py_Initialize() now longer copies path configuration from PyConfig
  to the global path configuration (_Py_path_config).
This commit is contained in:
Victor Stinner 2019-09-21 01:50:16 +02:00 committed by GitHub
parent 77af2290e5
commit e267793aa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/C API/2019-09-20-17-22-41.bpo-38234.ZbquVK.rst Normal file
View file

@ -0,0 +1,2 @@
Python ignored path passed to :c:func:`Py_SetPath`, fix Python
initialization to use the specified path.

10
Modules/getpath.c
View file

@ -1213,10 +1213,12 @@ calculate_path_impl(const PyConfig *config,
"Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>]\n");
}
status = calculate_module_search_path(config, calculate,
prefix, exec_prefix, pathconfig);
if (_PyStatus_EXCEPTION(status)) {
return status;
if (pathconfig->module_search_path == NULL) {
status = calculate_module_search_path(config, calculate,
prefix, exec_prefix, pathconfig);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
}
status = calculate_reduce_prefix(calculate, prefix, Py_ARRAY_LENGTH(prefix));

9
PC/getpathp.c
View file

@ -1003,9 +1003,12 @@ calculate_path_impl(const PyConfig *config,
calculate_home_prefix(calculate, prefix);
status = calculate_module_search_path(config, calculate, pathconfig, prefix);
if (_PyStatus_EXCEPTION(status)) {
return status;
if (pathconfig->module_search_path == NULL) {
status = calculate_module_search_path(config, calculate,
pathconfig, prefix);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
}
done:

7
Python/pathconfig.c
View file

@ -74,6 +74,13 @@ pathconfig_calculate(_PyPathConfig *pathconfig, const PyConfig *config)
PyMemAllocatorEx old_alloc;
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
if (copy_wstr(&new_config.module_search_path,
_Py_path_config.module_search_path) < 0)
{
status = _PyStatus_NO_MEMORY();
goto error;
}
/* Calculate program_full_path, prefix, exec_prefix,
dll_path (Windows), and module_search_path */
status = _PyPathConfig_Calculate(&new_config, config);