mirror of
https://github.com/python/cpython.git
synced 2026-01-03 14:02:21 +00:00
96c8475362
* bpo-38234: Py_SetPath() uses the program full path (GH-16357) Py_SetPath() now sets sys.executable to the program full path (Py_GetProgramFullPath()), rather than to the program name (Py_GetProgramName()). Fix also memory leaks in pathconfig_set_from_config(). (cherry picked from commit1ce152a42e) * bpo-38234: Add tests for Python init path config (GH-16358) (cherry picked from commitbb6bf7d342) * bpo-38234: test_embed: test pyvenv.cfg and pybuilddir.txt (GH-16366) Add test_init_pybuilddir() and test_init_pyvenv_cfg() to test_embed to test pyvenv.cfg and pybuilddir.txt configuration files. Fix sysconfig._generate_posix_vars(): pybuilddir.txt uses UTF-8 encoding, not ASCII. (cherry picked from commit52ad33abbf) * bpo-38234: Cleanup getpath.c (GH-16367) * search_for_prefix() directly calls reduce() if found is greater than 0. * Add calculate_pybuilddir() subfunction. * search_for_prefix(): add path string buffer for readability. * Fix some error handling code paths: release resources on error. * calculate_read_pyenv(): rename tmpbuffer to filename. * test.pythoninfo now also logs windows.dll_path (cherry picked from commit221fd84703) * bpo-38234: Fix test_embed pathconfig tests (GH-16390) bpo-38234: On macOS and FreeBSD, the temporary directory can be symbolic link. For example, /tmp can be a symbolic link to /var/tmp. Call realpath() to resolve all symbolic links. (cherry picked from commit00508a7407) * bpo-38234: Add test_init_setpath_config() to test_embed (GH-16402) * Add test_embed.test_init_setpath_config(): test Py_SetPath() with PyConfig. * test_init_setpath() and test_init_setpythonhome() no longer call Py_SetProgramName(), but use the default program name. * _PyPathConfig: isolated, site_import and base_executable fields are now only available on Windows. * If executable is set explicitly in the configuration, ignore calculated base_executable: _PyConfig_InitPathConfig() copies executable to base_executable. * Complete path config documentation. (cherry picked from commit8bf39b606e) * bpo-38234: Complete init config documentation (GH-16404) (cherry picked from commit88feaecd46) * bpo-38234: Fix test_embed.test_init_setpath_config() on FreeBSD (GH-16406) Explicitly preinitializes with a Python preconfiguration to avoid Py_SetPath() implicit preinitialization with a compat preconfiguration. Fix also test_init_setpath() and test_init_setpythonhome() on macOS: use self.test_exe as the executable (and base_executable), rather than shutil.which('python3'). (cherry picked from commit49d99f01e6) * bpo-38234: Py_Initialize() sets global path configuration (GH-16421) * Py_InitializeFromConfig() now writes PyConfig path configuration to the global path configuration (_Py_path_config). * Add test_embed.test_get_pathconfig(). * Fix typo in _PyWideStringList_Join(). (cherry picked from commit12f2f177fc)
75 lines
2 KiB
C
75 lines
2 KiB
C
#ifndef Py_INTERNAL_PATHCONFIG_H
|
|
#define Py_INTERNAL_PATHCONFIG_H
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef Py_BUILD_CORE
|
|
# error "this header requires Py_BUILD_CORE define"
|
|
#endif
|
|
|
|
typedef struct _PyPathConfig {
|
|
/* Full path to the Python program */
|
|
wchar_t *program_full_path;
|
|
wchar_t *prefix;
|
|
wchar_t *exec_prefix;
|
|
/* Set by Py_SetPath(), or computed by _PyConfig_InitPathConfig() */
|
|
wchar_t *module_search_path;
|
|
/* Python program name */
|
|
wchar_t *program_name;
|
|
/* Set by Py_SetPythonHome() or PYTHONHOME environment variable */
|
|
wchar_t *home;
|
|
#ifdef MS_WINDOWS
|
|
/* isolated and site_import are used to set Py_IsolatedFlag and
|
|
Py_NoSiteFlag flags on Windows in read_pth_file(). These fields
|
|
are ignored when their value are equal to -1 (unset). */
|
|
int isolated;
|
|
int site_import;
|
|
/* Set when a venv is detected */
|
|
wchar_t *base_executable;
|
|
#endif
|
|
} _PyPathConfig;
|
|
|
|
#ifdef MS_WINDOWS
|
|
# define _PyPathConfig_INIT \
|
|
{.module_search_path = NULL, \
|
|
.isolated = -1, \
|
|
.site_import = -1}
|
|
#else
|
|
# define _PyPathConfig_INIT \
|
|
{.module_search_path = NULL}
|
|
#endif
|
|
/* Note: _PyPathConfig_INIT sets other fields to 0/NULL */
|
|
|
|
PyAPI_DATA(_PyPathConfig) _Py_path_config;
|
|
#ifdef MS_WINDOWS
|
|
PyAPI_DATA(wchar_t*) _Py_dll_path;
|
|
#endif
|
|
|
|
extern void _PyPathConfig_ClearGlobal(void);
|
|
extern PyStatus _PyPathConfig_SetGlobal(
|
|
const struct _PyPathConfig *pathconfig);
|
|
|
|
extern PyStatus _PyPathConfig_Calculate(
|
|
_PyPathConfig *pathconfig,
|
|
const PyConfig *config);
|
|
extern int _PyPathConfig_ComputeSysPath0(
|
|
const PyWideStringList *argv,
|
|
PyObject **path0);
|
|
extern int _Py_FindEnvConfigValue(
|
|
FILE *env_file,
|
|
const wchar_t *key,
|
|
wchar_t *value,
|
|
size_t value_size);
|
|
|
|
#ifdef MS_WINDOWS
|
|
extern wchar_t* _Py_GetDLLPath(void);
|
|
#endif
|
|
|
|
extern PyStatus _PyConfig_WritePathConfig(const PyConfig *config);
|
|
extern void _Py_DumpPathConfig(PyThreadState *tstate);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* !Py_INTERNAL_PATHCONFIG_H */
|