From 9316ee4da2dcc217351418fc4dbe9205995689e0 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 25 Nov 2017 03:17:57 +0100 Subject: bpo-32030: Add _PyPathConfig_Init() (#4551) * Add _PyPathConfig_Init() and _PyPathConfig_Fini() * Remove _Py_GetPathWithConfig() * _PyPathConfig_Init() returns _PyInitError to allow to handle errors properly * Add pathconfig_clear() * Windows calculate_path_impl(): replace Py_FatalError() with _PyInitError * Py_FinalizeEx() now calls _PyPathConfig_Fini() to release memory * Fix _Py_InitializeMainInterpreter() regression: don't initialize path config if _disable_importlib is false * PyPathConfig now uses dynamically allocated memory --- Include/pylifecycle.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Include/pylifecycle.h') diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index ff91532338..d32c98b698 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -103,8 +103,9 @@ PyAPI_FUNC(wchar_t *) Py_GetPrefix(void); PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void); PyAPI_FUNC(wchar_t *) Py_GetPath(void); #ifdef Py_BUILD_CORE -PyAPI_FUNC(wchar_t *) _Py_GetPathWithConfig( - const _PyMainInterpreterConfig *config); +PyAPI_FUNC(_PyInitError) _PyPathConfig_Init( + const _PyMainInterpreterConfig *main_config); +PyAPI_FUNC(void) _PyPathConfig_Fini(void); #endif PyAPI_FUNC(void) Py_SetPath(const wchar_t *); #ifdef MS_WINDOWS -- cgit v1.2.1