bpo-36763: Implement the PEP 587 (GH-13592)
* Add a whole new documentation page:
"Python Initialization Configuration"
* PyWideStringList_Append() return type is now PyStatus,
instead of int
* PyInterpreterState_New() now calls PyConfig_Clear() if
PyConfig_InitPythonConfig() fails.
* Rename files:
* Python/coreconfig.c => Python/initconfig.c
* Include/cpython/coreconfig.h => Include/cpython/initconfig.h
* Include/internal/: pycore_coreconfig.h => pycore_initconfig.h
* Rename structures
* _PyCoreConfig => PyConfig
* _PyPreConfig => PyPreConfig
* _PyInitError => PyStatus
* _PyWstrList => PyWideStringList
* Rename PyConfig fields:
* use_module_search_paths => module_search_paths_set
* module_search_path_env => pythonpath_env
* Rename PyStatus field: _func => func
* PyInterpreterState: rename core_config field to config
* Rename macros and functions:
* _PyCoreConfig_SetArgv() => PyConfig_SetBytesArgv()
* _PyCoreConfig_SetWideArgv() => PyConfig_SetArgv()
* _PyCoreConfig_DecodeLocale() => PyConfig_SetBytesString()
* _PyInitError_Failed() => PyStatus_Exception()
* _Py_INIT_ERROR_TYPE_xxx enums => _PyStatus_TYPE_xxx
* _Py_UnixMain() => Py_BytesMain()
* _Py_ExitInitError() => Py_ExitStatusException()
* _Py_PreInitializeFromArgs() => Py_PreInitializeFromBytesArgs()
* _Py_PreInitializeFromWideArgs() => Py_PreInitializeFromArgs()
* _Py_PreInitialize() => Py_PreInitialize()
* _Py_RunMain() => Py_RunMain()
* _Py_InitializeFromConfig() => Py_InitializeFromConfig()
* _Py_INIT_XXX() => _PyStatus_XXX()
* _Py_INIT_FAILED() => _PyStatus_EXCEPTION()
* Rename 'err' PyStatus variables to 'status'
* Convert RUN_CODE() macro to config_run_code() static inline function
* Remove functions:
* _Py_InitializeFromArgs()
* _Py_InitializeFromWideArgs()
* _PyInterpreterState_GetCoreConfig()
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index ba8f001..5c2f019 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -377,7 +377,7 @@
{
PyObject *RawIO_class = (PyObject *)&PyFileIO_Type;
#ifdef MS_WINDOWS
- _PyCoreConfig *config = &_PyInterpreterState_GET_UNSAFE()->core_config;
+ PyConfig *config = &_PyInterpreterState_GET_UNSAFE()->config;
if (!config->legacy_windows_stdio && _PyIO_get_console_type(path_or_fd) != '\0') {
RawIO_class = (PyObject *)&PyWindowsConsoleIO_Type;
encoding = "utf-8";
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 6a0d9be..a5727b8 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -288,7 +288,7 @@
shutdown issues). */
if (res == NULL) {
#ifndef Py_DEBUG
- const _PyCoreConfig *config = &_PyInterpreterState_GET_UNSAFE()->core_config;
+ const PyConfig *config = &_PyInterpreterState_GET_UNSAFE()->config;
if (config->dev_mode) {
PyErr_WriteUnraisable(self);
}
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index 3a43ec1..3ea77e6 100644
--- a/Modules/_testinternalcapi.c
+++ b/Modules/_testinternalcapi.c
@@ -9,7 +9,7 @@
#define PY_SSIZE_T_CLEAN
#include "Python.h"
-#include "pycore_coreconfig.h"
+#include "pycore_initconfig.h"
static PyObject *
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index aa466c4..f2b5a50 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "pycore_coreconfig.h"
+#include "pycore_initconfig.h"
#include "pycore_traceback.h"
#include "pythread.h"
#include <signal.h>
@@ -1315,7 +1315,7 @@
return 0;
}
-_PyInitError
+PyStatus
_PyFaulthandler_Init(int enable)
{
#ifdef HAVE_SIGALTSTACK
@@ -1340,17 +1340,17 @@
thread.cancel_event = PyThread_allocate_lock();
thread.running = PyThread_allocate_lock();
if (!thread.cancel_event || !thread.running) {
- return _Py_INIT_ERR("failed to allocate locks for faulthandler");
+ return _PyStatus_ERR("failed to allocate locks for faulthandler");
}
PyThread_acquire_lock(thread.cancel_event, 1);
#endif
if (enable) {
if (faulthandler_init_enable() < 0) {
- return _Py_INIT_ERR("failed to enable faulthandler");
+ return _PyStatus_ERR("failed to enable faulthandler");
}
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
void _PyFaulthandler_Fini(void)
diff --git a/Modules/getpath.c b/Modules/getpath.c
index 3dcfcef..5f80738 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -1,7 +1,7 @@
/* Return the initial module search path. */
#include "Python.h"
-#include "pycore_coreconfig.h"
+#include "pycore_initconfig.h"
#include "osdefs.h"
#include "pycore_fileutils.h"
#include "pycore_pathconfig.h"
@@ -115,10 +115,10 @@
#define DECODE_LOCALE_ERR(NAME, LEN) \
((LEN) == (size_t)-2) \
- ? _Py_INIT_ERR("cannot decode " NAME) \
- : _Py_INIT_NO_MEMORY()
+ ? _PyStatus_ERR("cannot decode " NAME) \
+ : _PyStatus_NO_MEMORY()
-#define PATHLEN_ERR() _Py_INIT_ERR("path configuration: path too long")
+#define PATHLEN_ERR() _PyStatus_ERR("path configuration: path too long")
typedef struct {
wchar_t *path_env; /* PATH environment variable */
@@ -236,7 +236,7 @@
/* Add a path component, by appending stuff to buffer.
buflen: 'buffer' length in characters including trailing NUL. */
-static _PyInitError
+static PyStatus
joinpath(wchar_t *buffer, const wchar_t *stuff, size_t buflen)
{
size_t n, k;
@@ -261,7 +261,7 @@
wcsncpy(buffer+n, stuff, k);
buffer[n+k] = '\0';
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
@@ -280,7 +280,7 @@
/* copy_absolute requires that path be allocated at least
'pathlen' characters (including trailing NUL). */
-static _PyInitError
+static PyStatus
copy_absolute(wchar_t *path, const wchar_t *p, size_t pathlen)
{
if (p[0] == SEP) {
@@ -294,38 +294,38 @@
if (safe_wcscpy(path, p, pathlen) < 0) {
return PATHLEN_ERR();
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
if (p[0] == '.' && p[1] == SEP) {
p += 2;
}
- _PyInitError err = joinpath(path, p, pathlen);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ PyStatus status = joinpath(path, p, pathlen);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
/* path_len: path length in characters including trailing NUL */
-static _PyInitError
+static PyStatus
absolutize(wchar_t *path, size_t path_len)
{
if (path[0] == SEP) {
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
wchar_t abs_path[MAXPATHLEN+1];
- _PyInitError err = copy_absolute(abs_path, path, Py_ARRAY_LENGTH(abs_path));
- if (_Py_INIT_FAILED(err)) {
- return err;
+ PyStatus status = copy_absolute(abs_path, path, Py_ARRAY_LENGTH(abs_path));
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (safe_wcscpy(path, abs_path, path_len) < 0) {
return PATHLEN_ERR();
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
@@ -335,14 +335,14 @@
#endif
/* pathlen: 'path' length in characters including trailing NUL */
-static _PyInitError
+static PyStatus
add_exe_suffix(wchar_t *progpath, size_t progpathlen)
{
/* Check for already have an executable suffix */
size_t n = wcslen(progpath);
size_t s = wcslen(EXE_SUFFIX);
if (wcsncasecmp(EXE_SUFFIX, progpath + n - s, s) == 0) {
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
if (n + s >= progpathlen) {
@@ -356,7 +356,7 @@
progpath[n] = '\0';
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
#endif
@@ -364,43 +364,43 @@
/* search_for_prefix requires that argv0_path be no more than MAXPATHLEN
bytes long.
*/
-static _PyInitError
-search_for_prefix(const _PyCoreConfig *core_config, PyCalculatePath *calculate,
+static PyStatus
+search_for_prefix(const PyConfig *config, PyCalculatePath *calculate,
wchar_t *prefix, size_t prefix_len,
int *found)
{
- _PyInitError err;
+ PyStatus status;
size_t n;
wchar_t *vpath;
/* If PYTHONHOME is set, we believe it unconditionally */
- if (core_config->home) {
- if (safe_wcscpy(prefix, core_config->home, prefix_len) < 0) {
+ if (config->home) {
+ if (safe_wcscpy(prefix, config->home, prefix_len) < 0) {
return PATHLEN_ERR();
}
wchar_t *delim = wcschr(prefix, DELIM);
if (delim) {
*delim = L'\0';
}
- err = joinpath(prefix, calculate->lib_python, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, calculate->lib_python, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(prefix, LANDMARK, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, LANDMARK, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
*found = 1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
/* Check to see if argv[0] is in the build directory */
if (safe_wcscpy(prefix, calculate->argv0_path, prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(prefix, L"Modules/Setup.local", prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, L"Modules/Setup.local", prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (isfile(prefix)) {
@@ -410,48 +410,48 @@
if (safe_wcscpy(prefix, calculate->argv0_path, prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(prefix, vpath, prefix_len);
+ status = joinpath(prefix, vpath, prefix_len);
PyMem_RawFree(vpath);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(prefix, L"Lib", prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, L"Lib", prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(prefix, LANDMARK, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, LANDMARK, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (ismodule(prefix, prefix_len)) {
*found = -1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
}
}
/* Search from argv0_path, until root is found */
- err = copy_absolute(prefix, calculate->argv0_path, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = copy_absolute(prefix, calculate->argv0_path, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
do {
n = wcslen(prefix);
- err = joinpath(prefix, calculate->lib_python, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, calculate->lib_python, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(prefix, LANDMARK, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, LANDMARK, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (ismodule(prefix, prefix_len)) {
*found = 1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
prefix[n] = L'\0';
reduce(prefix);
@@ -461,59 +461,59 @@
if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(prefix, calculate->lib_python, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, calculate->lib_python, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(prefix, LANDMARK, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, LANDMARK, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (ismodule(prefix, prefix_len)) {
*found = 1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
/* Fail */
*found = 0;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
-calculate_prefix(const _PyCoreConfig *core_config,
+static PyStatus
+calculate_prefix(const PyConfig *config,
PyCalculatePath *calculate, wchar_t *prefix, size_t prefix_len)
{
- _PyInitError err;
+ PyStatus status;
- err = search_for_prefix(core_config, calculate, prefix, prefix_len,
+ status = search_for_prefix(config, calculate, prefix, prefix_len,
&calculate->prefix_found);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (!calculate->prefix_found) {
- if (core_config->pathconfig_warnings) {
+ if (config->pathconfig_warnings) {
fprintf(stderr,
"Could not find platform independent libraries <prefix>\n");
}
if (safe_wcscpy(prefix, calculate->prefix, prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(prefix, calculate->lib_python, prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(prefix, calculate->lib_python, prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
}
else {
reduce(prefix);
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
+static PyStatus
calculate_reduce_prefix(PyCalculatePath *calculate,
wchar_t *prefix, size_t prefix_len)
{
@@ -536,45 +536,45 @@
return PATHLEN_ERR();
}
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
/* search_for_exec_prefix requires that argv0_path be no more than
MAXPATHLEN bytes long.
*/
-static _PyInitError
-search_for_exec_prefix(const _PyCoreConfig *core_config,
+static PyStatus
+search_for_exec_prefix(const PyConfig *config,
PyCalculatePath *calculate,
wchar_t *exec_prefix, size_t exec_prefix_len,
int *found)
{
- _PyInitError err;
+ PyStatus status;
size_t n;
/* If PYTHONHOME is set, we believe it unconditionally */
- if (core_config->home) {
- wchar_t *delim = wcschr(core_config->home, DELIM);
+ if (config->home) {
+ wchar_t *delim = wcschr(config->home, DELIM);
if (delim) {
if (safe_wcscpy(exec_prefix, delim+1, exec_prefix_len) < 0) {
return PATHLEN_ERR();
}
}
else {
- if (safe_wcscpy(exec_prefix, core_config->home, exec_prefix_len) < 0) {
+ if (safe_wcscpy(exec_prefix, config->home, exec_prefix_len) < 0) {
return PATHLEN_ERR();
}
}
- err = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(exec_prefix, L"lib-dynload", exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, L"lib-dynload", exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
*found = 1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
/* Check to see if argv[0] is in the build directory. "pybuilddir.txt"
@@ -583,9 +583,9 @@
if (safe_wcscpy(exec_prefix, calculate->argv0_path, exec_prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(exec_prefix, L"pybuilddir.txt", exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, L"pybuilddir.txt", exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (isfile(exec_prefix)) {
@@ -609,36 +609,36 @@
if (safe_wcscpy(exec_prefix, calculate->argv0_path, exec_prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(exec_prefix, pybuilddir, exec_prefix_len);
+ status = joinpath(exec_prefix, pybuilddir, exec_prefix_len);
PyMem_RawFree(pybuilddir );
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
*found = -1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
}
/* Search from argv0_path, until root is found */
- err = copy_absolute(exec_prefix, calculate->argv0_path, exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = copy_absolute(exec_prefix, calculate->argv0_path, exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
do {
n = wcslen(exec_prefix);
- err = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(exec_prefix, L"lib-dynload", exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, L"lib-dynload", exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (isdir(exec_prefix)) {
*found = 1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
exec_prefix[n] = L'\0';
reduce(exec_prefix);
@@ -648,58 +648,58 @@
if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, calculate->lib_python, exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = joinpath(exec_prefix, L"lib-dynload", exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, L"lib-dynload", exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (isdir(exec_prefix)) {
*found = 1;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
/* Fail */
*found = 0;
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
-calculate_exec_prefix(const _PyCoreConfig *core_config,
+static PyStatus
+calculate_exec_prefix(const PyConfig *config,
PyCalculatePath *calculate,
wchar_t *exec_prefix, size_t exec_prefix_len)
{
- _PyInitError err;
+ PyStatus status;
- err = search_for_exec_prefix(core_config, calculate,
+ status = search_for_exec_prefix(config, calculate,
exec_prefix, exec_prefix_len,
&calculate->exec_prefix_found);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (!calculate->exec_prefix_found) {
- if (core_config->pathconfig_warnings) {
+ if (config->pathconfig_warnings) {
fprintf(stderr,
"Could not find platform dependent libraries <exec_prefix>\n");
}
if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) {
return PATHLEN_ERR();
}
- err = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
}
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
+static PyStatus
calculate_reduce_exec_prefix(PyCalculatePath *calculate,
wchar_t *exec_prefix, size_t exec_prefix_len)
{
@@ -716,15 +716,15 @@
return PATHLEN_ERR();
}
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
-calculate_program_full_path(const _PyCoreConfig *core_config,
- PyCalculatePath *calculate, _PyPathConfig *config)
+static PyStatus
+calculate_program_full_path(const PyConfig *config,
+ PyCalculatePath *calculate, _PyPathConfig *pathconfig)
{
- _PyInitError err;
+ PyStatus status;
wchar_t program_full_path[MAXPATHLEN + 1];
const size_t program_full_path_len = Py_ARRAY_LENGTH(program_full_path);
memset(program_full_path, 0, sizeof(program_full_path));
@@ -743,8 +743,8 @@
* other way to find a directory to start the search from. If
* $PATH isn't exported, you lose.
*/
- if (wcschr(core_config->program_name, SEP)) {
- if (safe_wcscpy(program_full_path, core_config->program_name,
+ if (wcschr(config->program_name, SEP)) {
+ if (safe_wcscpy(program_full_path, config->program_name,
program_full_path_len) < 0) {
return PATHLEN_ERR();
}
@@ -795,10 +795,10 @@
}
}
- err = joinpath(program_full_path, core_config->program_name,
+ status = joinpath(program_full_path, config->program_name,
program_full_path_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if (isxfile(program_full_path)) {
@@ -816,9 +816,9 @@
program_full_path[0] = '\0';
}
if (program_full_path[0] != SEP && program_full_path[0] != '\0') {
- err = absolutize(program_full_path, program_full_path_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = absolutize(program_full_path, program_full_path_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
}
#if defined(__CYGWIN__) || defined(__MINGW32__)
@@ -828,22 +828,22 @@
* path (bpo-28441).
*/
if (program_full_path[0] != '\0') {
- err = add_exe_suffix(program_full_path, program_full_path_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = add_exe_suffix(program_full_path, program_full_path_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
}
#endif
- config->program_full_path = _PyMem_RawWcsdup(program_full_path);
- if (config->program_full_path == NULL) {
- return _Py_INIT_NO_MEMORY();
+ pathconfig->program_full_path = _PyMem_RawWcsdup(program_full_path);
+ if (pathconfig->program_full_path == NULL) {
+ return _PyStatus_NO_MEMORY();
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
+static PyStatus
calculate_argv0_path(PyCalculatePath *calculate, const wchar_t *program_full_path)
{
const size_t argv0_path_len = Py_ARRAY_LENGTH(calculate->argv0_path);
@@ -871,7 +871,7 @@
** be running the interpreter in the build directory, so we use the
** build-directory-specific logic to find Lib and such.
*/
- _PyInitError err;
+ PyStatus status;
size_t len;
wchar_t* wbuf = Py_DecodeLocale(modPath, &len);
if (wbuf == NULL) {
@@ -882,15 +882,15 @@
return PATHLEN_ERR();
}
reduce(calculate->argv0_path);
- err = joinpath(calculate->argv0_path, calculate->lib_python, argv0_path_len);
- if (_Py_INIT_FAILED(err)) {
+ status = joinpath(calculate->argv0_path, calculate->lib_python, argv0_path_len);
+ if (_PyStatus_EXCEPTION(status)) {
PyMem_RawFree(wbuf);
- return err;
+ return status;
}
- err = joinpath(calculate->argv0_path, LANDMARK, argv0_path_len);
- if (_Py_INIT_FAILED(err)) {
+ status = joinpath(calculate->argv0_path, LANDMARK, argv0_path_len);
+ if (_PyStatus_EXCEPTION(status)) {
PyMem_RawFree(wbuf);
- return err;
+ return status;
}
if (!ismodule(calculate->argv0_path,
Py_ARRAY_LENGTH(calculate->argv0_path))) {
@@ -925,11 +925,11 @@
}
else {
/* Interpret relative to program_full_path */
- _PyInitError err;
+ PyStatus status;
reduce(calculate->argv0_path);
- err = joinpath(calculate->argv0_path, tmpbuffer, argv0_path_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(calculate->argv0_path, tmpbuffer, argv0_path_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
}
linklen = _Py_wreadlink(calculate->argv0_path, tmpbuffer, buflen);
@@ -939,7 +939,7 @@
reduce(calculate->argv0_path);
/* At this point, argv0_path is guaranteed to be less than
MAXPATHLEN bytes long. */
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
@@ -947,10 +947,10 @@
executable's directory and then in the parent directory.
If found, open it for use when searching for prefixes.
*/
-static _PyInitError
+static PyStatus
calculate_read_pyenv(PyCalculatePath *calculate)
{
- _PyInitError err;
+ PyStatus status;
wchar_t tmpbuffer[MAXPATHLEN+1];
const size_t buflen = Py_ARRAY_LENGTH(tmpbuffer);
wchar_t *env_cfg = L"pyvenv.cfg";
@@ -960,9 +960,9 @@
return PATHLEN_ERR();
}
- err = joinpath(tmpbuffer, env_cfg, buflen);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(tmpbuffer, env_cfg, buflen);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
env_file = _Py_wfopen(tmpbuffer, L"r");
if (env_file == NULL) {
@@ -970,9 +970,9 @@
reduce(tmpbuffer);
reduce(tmpbuffer);
- err = joinpath(tmpbuffer, env_cfg, buflen);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(tmpbuffer, env_cfg, buflen);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
env_file = _Py_wfopen(tmpbuffer, L"r");
@@ -982,7 +982,7 @@
}
if (env_file == NULL) {
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
/* Look for a 'home' variable and set argv0_path to it, if found */
@@ -993,14 +993,14 @@
}
}
fclose(env_file);
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
+static PyStatus
calculate_zip_path(PyCalculatePath *calculate, const wchar_t *prefix)
{
- _PyInitError err;
+ PyStatus status;
const size_t zip_path_len = Py_ARRAY_LENGTH(calculate->zip_path);
if (safe_wcscpy(calculate->zip_path, prefix, zip_path_len) < 0) {
return PATHLEN_ERR();
@@ -1016,29 +1016,29 @@
return PATHLEN_ERR();
}
}
- err = joinpath(calculate->zip_path, L"lib/python00.zip", zip_path_len);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = joinpath(calculate->zip_path, L"lib/python00.zip", zip_path_len);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
/* Replace "00" with version */
size_t bufsz = wcslen(calculate->zip_path);
calculate->zip_path[bufsz - 6] = VERSION[0];
calculate->zip_path[bufsz - 5] = VERSION[2];
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-static _PyInitError
-calculate_module_search_path(const _PyCoreConfig *core_config,
+static PyStatus
+calculate_module_search_path(const PyConfig *config,
PyCalculatePath *calculate,
const wchar_t *prefix, const wchar_t *exec_prefix,
- _PyPathConfig *config)
+ _PyPathConfig *pathconfig)
{
/* Calculate size of return buffer */
size_t bufsz = 0;
- if (core_config->module_search_path_env != NULL) {
- bufsz += wcslen(core_config->module_search_path_env) + 1;
+ if (config->pythonpath_env != NULL) {
+ bufsz += wcslen(config->pythonpath_env) + 1;
}
wchar_t *defpath = calculate->pythonpath;
@@ -1067,13 +1067,13 @@
/* Allocate the buffer */
wchar_t *buf = PyMem_RawMalloc(bufsz * sizeof(wchar_t));
if (buf == NULL) {
- return _Py_INIT_NO_MEMORY();
+ return _PyStatus_NO_MEMORY();
}
buf[0] = '\0';
/* Run-time value of $PYTHONPATH goes first */
- if (core_config->module_search_path_env) {
- wcscpy(buf, core_config->module_search_path_env);
+ if (config->pythonpath_env) {
+ wcscpy(buf, config->pythonpath_env);
wcscat(buf, delimiter);
}
@@ -1115,14 +1115,14 @@
/* Finally, on goes the directory for dynamic-load modules */
wcscat(buf, exec_prefix);
- config->module_search_path = buf;
- return _Py_INIT_OK();
+ pathconfig->module_search_path = buf;
+ return _PyStatus_OK();
}
-static _PyInitError
+static PyStatus
calculate_init(PyCalculatePath *calculate,
- const _PyCoreConfig *core_config)
+ const PyConfig *config)
{
size_t len;
const char *path = getenv("PATH");
@@ -1149,7 +1149,7 @@
if (!calculate->lib_python) {
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
@@ -1164,108 +1164,108 @@
}
-static _PyInitError
-calculate_path_impl(const _PyCoreConfig *core_config,
- PyCalculatePath *calculate, _PyPathConfig *config)
+static PyStatus
+calculate_path_impl(const PyConfig *config,
+ PyCalculatePath *calculate, _PyPathConfig *pathconfig)
{
- _PyInitError err;
+ PyStatus status;
- err = calculate_program_full_path(core_config, calculate, config);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = calculate_program_full_path(config, calculate, pathconfig);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = calculate_argv0_path(calculate, config->program_full_path);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = calculate_argv0_path(calculate, pathconfig->program_full_path);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = calculate_read_pyenv(calculate);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = calculate_read_pyenv(calculate);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
wchar_t prefix[MAXPATHLEN+1];
memset(prefix, 0, sizeof(prefix));
- err = calculate_prefix(core_config, calculate,
+ status = calculate_prefix(config, calculate,
prefix, Py_ARRAY_LENGTH(prefix));
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = calculate_zip_path(calculate, prefix);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = calculate_zip_path(calculate, prefix);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
wchar_t exec_prefix[MAXPATHLEN+1];
memset(exec_prefix, 0, sizeof(exec_prefix));
- err = calculate_exec_prefix(core_config, calculate,
+ status = calculate_exec_prefix(config, calculate,
exec_prefix, Py_ARRAY_LENGTH(exec_prefix));
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
if ((!calculate->prefix_found || !calculate->exec_prefix_found) &&
- core_config->pathconfig_warnings)
+ config->pathconfig_warnings)
{
fprintf(stderr,
"Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>]\n");
}
- err = calculate_module_search_path(core_config, calculate,
- prefix, exec_prefix, config);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = calculate_module_search_path(config, calculate,
+ prefix, exec_prefix, pathconfig);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- err = calculate_reduce_prefix(calculate, prefix, Py_ARRAY_LENGTH(prefix));
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = calculate_reduce_prefix(calculate, prefix, Py_ARRAY_LENGTH(prefix));
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- config->prefix = _PyMem_RawWcsdup(prefix);
- if (config->prefix == NULL) {
- return _Py_INIT_NO_MEMORY();
+ pathconfig->prefix = _PyMem_RawWcsdup(prefix);
+ if (pathconfig->prefix == NULL) {
+ return _PyStatus_NO_MEMORY();
}
- err = calculate_reduce_exec_prefix(calculate,
+ status = calculate_reduce_exec_prefix(calculate,
exec_prefix, Py_ARRAY_LENGTH(exec_prefix));
- if (_Py_INIT_FAILED(err)) {
- return err;
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- config->exec_prefix = _PyMem_RawWcsdup(exec_prefix);
- if (config->exec_prefix == NULL) {
- return _Py_INIT_NO_MEMORY();
+ pathconfig->exec_prefix = _PyMem_RawWcsdup(exec_prefix);
+ if (pathconfig->exec_prefix == NULL) {
+ return _PyStatus_NO_MEMORY();
}
- return _Py_INIT_OK();
+ return _PyStatus_OK();
}
-_PyInitError
-_PyPathConfig_Calculate_impl(_PyPathConfig *config, const _PyCoreConfig *core_config)
+PyStatus
+_PyPathConfig_Calculate(_PyPathConfig *pathconfig, const PyConfig *config)
{
- _PyInitError err;
+ PyStatus status;
PyCalculatePath calculate;
memset(&calculate, 0, sizeof(calculate));
- err = calculate_init(&calculate, core_config);
- if (_Py_INIT_FAILED(err)) {
+ status = calculate_init(&calculate, config);
+ if (_PyStatus_EXCEPTION(status)) {
goto done;
}
- err = calculate_path_impl(core_config, &calculate, config);
- if (_Py_INIT_FAILED(err)) {
+ status = calculate_path_impl(config, &calculate, pathconfig);
+ if (_PyStatus_EXCEPTION(status)) {
goto done;
}
- err = _Py_INIT_OK();
+ status = _PyStatus_OK();
done:
calculate_free(&calculate);
- return err;
+ return status;
}
#ifdef __cplusplus
diff --git a/Modules/main.c b/Modules/main.c
index 08fb0e0..6b9406f 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -1,7 +1,7 @@
/* Python interpreter main program */
#include "Python.h"
-#include "pycore_coreconfig.h"
+#include "pycore_initconfig.h"
#include "pycore_pylifecycle.h"
#include "pycore_pymem.h"
#include "pycore_pystate.h"
@@ -33,14 +33,14 @@
/* --- pymain_init() ---------------------------------------------- */
-static _PyInitError
+static PyStatus
pymain_init(const _PyArgv *args)
{
- _PyInitError err;
+ PyStatus status;
- err = _PyRuntime_Initialize();
- if (_Py_INIT_FAILED(err)) {
- return err;
+ status = _PyRuntime_Initialize();
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
/* 754 requires that FP exceptions run in "no stop" mode by default,
@@ -52,29 +52,36 @@
fedisableexcept(FE_OVERFLOW);
#endif
- _PyPreConfig preconfig;
- _PyPreConfig_InitPythonConfig(&preconfig);
- err = _Py_PreInitializeFromPyArgv(&preconfig, args);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ PyPreConfig preconfig;
+ PyPreConfig_InitPythonConfig(&preconfig);
+ status = _Py_PreInitializeFromPyArgv(&preconfig, args);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
- _PyCoreConfig config;
- err = _PyCoreConfig_InitPythonConfig(&config);
- if (_Py_INIT_FAILED(err)) {
- return err;
+ PyConfig config;
+ status = PyConfig_InitPythonConfig(&config);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
}
/* pass NULL as the config: config is read from command line arguments,
environment variables, configuration files */
if (args->use_bytes_argv) {
- return _Py_InitializeFromArgs(&config,
- args->argc, args->bytes_argv);
+ status = PyConfig_SetBytesArgv(&config, args->argc, args->bytes_argv);
}
else {
- return _Py_InitializeFromWideArgs(&config,
- args->argc, args->wchar_argv);
+ status = PyConfig_SetArgv(&config, args->argc, args->wchar_argv);
}
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
+ }
+
+ status = Py_InitializeFromConfig(&config);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
+ }
+ return _PyStatus_OK();
}
@@ -82,13 +89,17 @@
/* Non-zero if filename, command (-c) or module (-m) is set
on the command line */
-#define RUN_CODE(config) \
- (config->run_command != NULL || config->run_filename != NULL \
- || config->run_module != NULL)
+static inline int config_run_code(const PyConfig *config)
+{
+ return (config->run_command != NULL
+ || config->run_filename != NULL
+ || config->run_module != NULL);
+}
+
/* Return non-zero is stdin is a TTY or if -i command line option is used */
static int
-stdin_is_interactive(const _PyCoreConfig *config)
+stdin_is_interactive(const PyConfig *config)
{
return (isatty(fileno(stdin)) || config->interactive);
}
@@ -181,13 +192,13 @@
static void
-pymain_header(const _PyCoreConfig *config)
+pymain_header(const PyConfig *config)
{
if (config->quiet) {
return;
}
- if (!config->verbose && (RUN_CODE(config) || !stdin_is_interactive(config))) {
+ if (!config->verbose && (config_run_code(config) || !stdin_is_interactive(config))) {
return;
}
@@ -199,12 +210,12 @@
static void
-pymain_import_readline(const _PyCoreConfig *config)
+pymain_import_readline(const PyConfig *config)
{
if (config->isolated) {
return;
}
- if (!config->inspect && RUN_CODE(config)) {
+ if (!config->inspect && config_run_code(config)) {
return;
}
if (!isatty(fileno(stdin))) {
@@ -293,7 +304,7 @@
static int
-pymain_run_file(_PyCoreConfig *config, PyCompilerFlags *cf)
+pymain_run_file(PyConfig *config, PyCompilerFlags *cf)
{
const wchar_t *filename = config->run_filename;
FILE *fp = _Py_wfopen(filename, L"rb");
@@ -362,7 +373,7 @@
static int
-pymain_run_startup(_PyCoreConfig *config, PyCompilerFlags *cf, int *exitcode)
+pymain_run_startup(PyConfig *config, PyCompilerFlags *cf, int *exitcode)
{
const char *startup = _Py_GetEnv(config->use_environment, "PYTHONSTARTUP");
if (startup == NULL) {
@@ -421,7 +432,7 @@
static int
-pymain_run_stdin(_PyCoreConfig *config, PyCompilerFlags *cf)
+pymain_run_stdin(PyConfig *config, PyCompilerFlags *cf)
{
if (stdin_is_interactive(config)) {
config->inspect = 0;
@@ -448,7 +459,7 @@
static void
-pymain_repl(_PyCoreConfig *config, PyCompilerFlags *cf, int *exitcode)
+pymain_repl(PyConfig *config, PyCompilerFlags *cf, int *exitcode)
{
/* Check this environment variable at the end, to give programs the
opportunity to set it from Python. */
@@ -457,7 +468,7 @@
Py_InspectFlag = 1;
}
- if (!(config->inspect && stdin_is_interactive(config) && RUN_CODE(config))) {
+ if (!(config->inspect && stdin_is_interactive(config) && config_run_code(config))) {
return;
}
@@ -477,7 +488,7 @@
{
PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
/* pymain_run_stdin() modify the config */
- _PyCoreConfig *config = &interp->core_config;
+ PyConfig *config = &interp->config;
PyObject *main_importer_path = NULL;
if (config->run_filename != NULL) {
@@ -590,20 +601,20 @@
static void _Py_NO_RETURN
-pymain_exit_error(_PyInitError err)
+pymain_exit_error(PyStatus status)
{
- if (_Py_INIT_IS_EXIT(err)) {
+ if (_PyStatus_IS_EXIT(status)) {
/* If it's an error rather than a regular exit, leave Python runtime
- alive: _Py_ExitInitError() uses the current exception and use
+ alive: Py_ExitStatusException() uses the current exception and use
sys.stdout in this case. */
pymain_free();
}
- _Py_ExitInitError(err);
+ Py_ExitStatusException(status);
}
int
-_Py_RunMain(void)
+Py_RunMain(void)
{
int exitcode = 0;
@@ -628,16 +639,16 @@
static int
pymain_main(_PyArgv *args)
{
- _PyInitError err = pymain_init(args);
- if (_Py_INIT_IS_EXIT(err)) {
+ PyStatus status = pymain_init(args);
+ if (_PyStatus_IS_EXIT(status)) {
pymain_free();
- return err.exitcode;
+ return status.exitcode;
}
- if (_Py_INIT_FAILED(err)) {
- pymain_exit_error(err);
+ if (_PyStatus_EXCEPTION(status)) {
+ pymain_exit_error(status);
}
- return _Py_RunMain();
+ return Py_RunMain();
}
@@ -654,7 +665,7 @@
int
-_Py_UnixMain(int argc, char **argv)
+Py_BytesMain(int argc, char **argv)
{
_PyArgv args = {
.argc = argc,