bpo-38304: Remove PyConfig.struct_size (GH-16500)
For now, we'll rely on the fact that the config structures aren't covered by the stable ABI.
We may revisit this in the future if we further explore the idea of offering a stable embedding API.
diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst
index 4c77d5d..15b8b94 100644
--- a/Doc/c-api/init_config.rst
+++ b/Doc/c-api/init_config.rst
@@ -194,25 +194,18 @@
* Configure the LC_CTYPE locale
* Set the UTF-8 mode
- The :c:member:`struct_size` field must be explicitly initialized to
- ``sizeof(PyPreConfig)``.
-
Function to initialize a preconfiguration:
- .. c:function:: PyStatus PyPreConfig_InitIsolatedConfig(PyPreConfig *preconfig)
+ .. c:function:: void PyPreConfig_InitIsolatedConfig(PyPreConfig *preconfig)
Initialize the preconfiguration with :ref:`Python Configuration
<init-python-config>`.
- .. c:function:: PyStatus PyPreConfig_InitPythonConfig(PyPreConfig *preconfig)
+ .. c:function:: void PyPreConfig_InitPythonConfig(PyPreConfig *preconfig)
Initialize the preconfiguration with :ref:`Isolated Configuration
<init-isolated-conf>`.
- The caller of these functions is responsible to handle exceptions (error or
- exit) using :c:func:`PyStatus_Exception` and
- :c:func:`Py_ExitStatusException`.
-
Structure fields:
.. c:member:: int allocator
@@ -274,13 +267,6 @@
same way the regular Python parses command line arguments: see
:ref:`Command Line Arguments <using-on-cmdline>`.
- .. c:member:: size_t struct_size
-
- Size of the structure in bytes: must be initialized to
- ``sizeof(PyPreConfig)``.
-
- Field used for API and ABI compatibility.
-
.. c:member:: int use_environment
See :c:member:`PyConfig.use_environment`.
@@ -332,12 +318,7 @@
PyStatus status;
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = PyPreConfig_InitPythonConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ PyPreConfig_InitPythonConfig(&preconfig);
preconfig.utf8_mode = 1;
@@ -360,9 +341,6 @@
Structure containing most parameters to configure Python.
- The :c:member:`struct_size` field must be explicitly initialized to
- ``sizeof(PyConfig)``.
-
Structure methods:
.. c:function:: PyStatus PyConfig_InitPythonConfig(PyConfig *config)
@@ -679,13 +657,6 @@
Encoding and encoding errors of :data:`sys.stdin`, :data:`sys.stdout` and
:data:`sys.stderr`.
- .. c:member:: size_t struct_size
-
- Size of the structure in bytes: must be initialized to
- ``sizeof(PyConfig)``.
-
- Field used for API and ABI compatibility.
-
.. c:member:: int tracemalloc
If non-zero, call :func:`tracemalloc.start` at startup.
@@ -754,7 +725,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -787,7 +757,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -875,7 +844,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1067,7 +1035,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
index 8ce5622..25e02ce 100644
--- a/Include/cpython/initconfig.h
+++ b/Include/cpython/initconfig.h
@@ -45,10 +45,6 @@
/* --- PyPreConfig ----------------------------------------------- */
typedef struct {
- /* Size of the structure in bytes: must be initialized to
- sizeof(PyPreConfig). Field used for API and ABI compatibility. */
- size_t struct_size;
-
int _config_init; /* _PyConfigInitEnum value */
/* Parse Py_PreInitializeFromBytesArgs() arguments?
@@ -124,17 +120,13 @@
int allocator;
} PyPreConfig;
-PyAPI_FUNC(PyStatus) PyPreConfig_InitPythonConfig(PyPreConfig *config);
-PyAPI_FUNC(PyStatus) PyPreConfig_InitIsolatedConfig(PyPreConfig *config);
+PyAPI_FUNC(void) PyPreConfig_InitPythonConfig(PyPreConfig *config);
+PyAPI_FUNC(void) PyPreConfig_InitIsolatedConfig(PyPreConfig *config);
/* --- PyConfig ---------------------------------------------- */
typedef struct {
- /* Size of the structure in bytes: must be initialized to
- sizeof(PyConfig). Field used for API and ABI compatibility. */
- size_t struct_size;
-
int _config_init; /* _PyConfigInitEnum value */
int isolated; /* Isolated mode? see PyPreConfig.isolated */
diff --git a/Include/internal/pycore_initconfig.h b/Include/internal/pycore_initconfig.h
index eb6490f..e9810bc 100644
--- a/Include/internal/pycore_initconfig.h
+++ b/Include/internal/pycore_initconfig.h
@@ -120,8 +120,8 @@
/* --- PyPreConfig ----------------------------------------------- */
-PyAPI_FUNC(PyStatus) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig);
-extern PyStatus _PyPreConfig_InitFromConfig(
+PyAPI_FUNC(void) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig);
+extern void _PyPreConfig_InitFromConfig(
PyPreConfig *preconfig,
const PyConfig *config);
extern PyStatus _PyPreConfig_InitFromPreConfig(
diff --git a/Misc/NEWS.d/next/C API/2019-09-28-03-43-27.bpo-38304.RqHAwd.rst b/Misc/NEWS.d/next/C API/2019-09-28-03-43-27.bpo-38304.RqHAwd.rst
deleted file mode 100644
index b797933..0000000
--- a/Misc/NEWS.d/next/C API/2019-09-28-03-43-27.bpo-38304.RqHAwd.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Add a new ``struct_size`` field to :c:type:`PyPreConfig` and :c:type:`PyConfig`
-structures to allow to modify these structures in the future without breaking
-the backward compatibility.
diff --git a/Modules/main.c b/Modules/main.c
index 13936ad..66af89f 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -53,12 +53,7 @@
#endif
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = PyPreConfig_InitPythonConfig(&preconfig);
- if (_PyStatus_EXCEPTION(status)) {
- return status;
- }
+ PyPreConfig_InitPythonConfig(&preconfig);
status = _Py_PreInitializeFromPyArgv(&preconfig, args);
if (_PyStatus_EXCEPTION(status)) {
@@ -66,7 +61,7 @@
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
+
status = PyConfig_InitPythonConfig(&config);
if (_PyStatus_EXCEPTION(status)) {
goto done;
diff --git a/PC/python_uwp.cpp b/PC/python_uwp.cpp
index 2656d18..758c8f7 100644
--- a/PC/python_uwp.cpp
+++ b/PC/python_uwp.cpp
@@ -165,12 +165,8 @@
wmain(int argc, wchar_t **argv)
{
PyStatus status;
-
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
PyConfig config;
- config.struct_size = sizeof(PyConfig);
const wchar_t *moduleName = NULL;
const wchar_t *p = wcsrchr(argv[0], L'\\');
@@ -189,10 +185,7 @@
}
}
- status = PyPreConfig_InitPythonConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- goto fail_without_config;
- }
+ PyPreConfig_InitPythonConfig(&preconfig);
if (!moduleName) {
status = Py_PreInitializeFromArgs(&preconfig, argc, argv);
if (PyStatus_Exception(status)) {
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c
index 7c494c2..74735f2 100644
--- a/Programs/_freeze_importlib.c
+++ b/Programs/_freeze_importlib.c
@@ -78,7 +78,6 @@
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitIsolatedConfig(&config);
if (PyStatus_Exception(status)) {
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index c8600d5..d2d4c7f 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -385,12 +385,7 @@
if (preinit) {
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = _PyPreConfig_InitCompatConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ _PyPreConfig_InitCompatConfig(&preconfig);
status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
@@ -399,7 +394,6 @@
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = _PyConfig_InitCompatConfig(&config);
if (PyStatus_Exception(status)) {
@@ -478,15 +472,8 @@
static int test_init_from_config(void)
{
- PyStatus status;
-
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = _PyPreConfig_InitCompatConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ _PyPreConfig_InitCompatConfig(&preconfig);
putenv("PYTHONMALLOC=malloc_debug");
preconfig.allocator = PYMEM_ALLOCATOR_MALLOC;
@@ -495,13 +482,12 @@
Py_UTF8Mode = 0;
preconfig.utf8_mode = 1;
- status = Py_PreInitialize(&preconfig);
+ PyStatus status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
Py_ExitStatusException(status);
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = _PyConfig_InitCompatConfig(&config);
if (PyStatus_Exception(status)) {
@@ -638,7 +624,6 @@
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -725,7 +710,6 @@
set_all_env_vars();
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -780,7 +764,6 @@
/* Test PyConfig.isolated=1 */
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -803,25 +786,17 @@
/* PyPreConfig.isolated=1, PyConfig.isolated=0 */
static int test_preinit_isolated1(void)
{
- PyStatus status;
-
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = _PyPreConfig_InitCompatConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ _PyPreConfig_InitCompatConfig(&preconfig);
preconfig.isolated = 1;
- status = Py_PreInitialize(&preconfig);
+ PyStatus status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
Py_ExitStatusException(status);
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = _PyConfig_InitCompatConfig(&config);
if (PyStatus_Exception(status)) {
@@ -840,26 +815,19 @@
/* PyPreConfig.isolated=0, PyConfig.isolated=1 */
static int test_preinit_isolated2(void)
{
- PyStatus status;
-
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = _PyPreConfig_InitCompatConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ _PyPreConfig_InitCompatConfig(&preconfig);
preconfig.isolated = 0;
- status = Py_PreInitialize(&preconfig);
+ PyStatus status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
Py_ExitStatusException(status);
}
/* Test PyConfig.isolated=1 */
PyConfig config;
- config.struct_size = sizeof(PyConfig);
+
status = _PyConfig_InitCompatConfig(&config);
if (PyStatus_Exception(status)) {
Py_ExitStatusException(status);
@@ -880,15 +848,8 @@
static int test_preinit_dont_parse_argv(void)
{
- PyStatus status;
-
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = PyPreConfig_InitIsolatedConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ PyPreConfig_InitIsolatedConfig(&preconfig);
preconfig.isolated = 0;
@@ -899,13 +860,13 @@
L"-X", L"dev",
L"-X", L"utf8",
L"script.py"};
- status = Py_PreInitializeFromArgs(&preconfig, Py_ARRAY_LENGTH(argv), argv);
+ PyStatus status = Py_PreInitializeFromArgs(&preconfig,
+ Py_ARRAY_LENGTH(argv), argv);
if (PyStatus_Exception(status)) {
Py_ExitStatusException(status);
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitIsolatedConfig(&config);
if (PyStatus_Exception(status)) {
@@ -931,7 +892,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -989,12 +949,7 @@
if (preinit) {
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = PyPreConfig_InitIsolatedConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ PyPreConfig_InitIsolatedConfig(&preconfig);
status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
@@ -1007,7 +962,6 @@
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitIsolatedConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1058,12 +1012,7 @@
if (preinit) {
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = PyPreConfig_InitPythonConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ PyPreConfig_InitPythonConfig(&preconfig);
status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
@@ -1072,7 +1021,6 @@
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1101,27 +1049,19 @@
static int test_init_dont_configure_locale(void)
{
- PyStatus status;
-
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = PyPreConfig_InitPythonConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ PyPreConfig_InitPythonConfig(&preconfig);
preconfig.configure_locale = 0;
preconfig.coerce_c_locale = 1;
preconfig.coerce_c_locale_warn = 1;
- status = Py_PreInitialize(&preconfig);
+ PyStatus status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
Py_ExitStatusException(status);
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1140,7 +1080,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1365,7 +1304,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1415,7 +1353,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1465,7 +1402,6 @@
PySys_AddWarnOption(L"ignore:::sysadd_warnoption");
PyConfig config;
- config.struct_size = sizeof(PyConfig);
PyStatus status;
status = PyConfig_InitPythonConfig(&config);
@@ -1533,18 +1469,12 @@
static int test_init_setpath_config(void)
{
- PyStatus status;
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
-
- status = PyPreConfig_InitPythonConfig(&preconfig);
- if (PyStatus_Exception(status)) {
- Py_ExitStatusException(status);
- }
+ PyPreConfig_InitPythonConfig(&preconfig);
/* Explicitly preinitializes with Python preconfiguration to avoid
Py_SetPath() implicit preinitialization with compat preconfiguration. */
- status = Py_PreInitialize(&preconfig);
+ PyStatus status = Py_PreInitialize(&preconfig);
if (PyStatus_Exception(status)) {
Py_ExitStatusException(status);
}
@@ -1564,7 +1494,6 @@
putenv("TESTPATH=");
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1612,7 +1541,6 @@
PySys_AddWarnOption(L"ignore:::PySys_AddWarnOption2");
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1680,7 +1608,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1697,7 +1624,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
@@ -1729,7 +1655,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index 76309e9..c56938a 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -40,7 +40,6 @@
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = PyConfig_InitPythonConfig(&config);
if (PyStatus_Exception(status)) {
PyConfig_Clear(&config);
diff --git a/Python/initconfig.c b/Python/initconfig.c
index fb04b4a..9164c7c 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -529,17 +529,6 @@
: _PyStatus_NO_MEMORY())
-static PyStatus
-config_check_struct_size(const PyConfig *config)
-{
- if (config->struct_size != sizeof(PyConfig)) {
- return _PyStatus_ERR("unsupported PyConfig structure size "
- "(Python version mismatch?)");
- }
- return _PyStatus_OK();
-}
-
-
/* Free memory allocated in config, but don't clear all attributes */
void
PyConfig_Clear(PyConfig *config)
@@ -583,15 +572,7 @@
PyStatus
_PyConfig_InitCompatConfig(PyConfig *config)
{
- size_t struct_size = config->struct_size;
memset(config, 0, sizeof(*config));
- config->struct_size = struct_size;
-
- PyStatus status = config_check_struct_size(config);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
config->_config_init = (int)_PyConfig_INIT_COMPAT;
config->isolated = -1;
@@ -775,18 +756,6 @@
{
PyStatus status;
- status = config_check_struct_size(config);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
-
- status = config_check_struct_size(config2);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
-
PyConfig_Clear(config);
#define COPY_ATTR(ATTR) config->ATTR = config2->ATTR
@@ -2275,7 +2244,6 @@
}
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
status = _PyPreConfig_InitFromPreConfig(&preconfig, &_PyRuntime.preconfig);
if (_PyStatus_EXCEPTION(status)) {
@@ -2428,12 +2396,6 @@
PyStatus status;
PyWideStringList orig_argv = _PyWideStringList_INIT;
- status = config_check_struct_size(config);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
-
status = _Py_PreInitializeFromConfig(config, NULL);
if (_PyStatus_EXCEPTION(status)) {
return status;
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 41ef7d2..ff4bbf2 100644
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -434,7 +434,6 @@
{
PyStatus status;
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = _PyConfig_InitCompatConfig(&config);
if (_PyStatus_EXCEPTION(status)) {
diff --git a/Python/preconfig.c b/Python/preconfig.c
index 01c72f5..89a6227 100644
--- a/Python/preconfig.c
+++ b/Python/preconfig.c
@@ -269,29 +269,10 @@
/* --- PyPreConfig ----------------------------------------------- */
-static PyStatus
-preconfig_check_struct_size(PyPreConfig *config)
-{
- if (config->struct_size != sizeof(PyPreConfig)) {
- return _PyStatus_ERR("unsupported PyPreConfig structure size "
- "(Python version mismatch?)");
- }
- return _PyStatus_OK();
-}
-
-
-PyStatus
+void
_PyPreConfig_InitCompatConfig(PyPreConfig *config)
{
- size_t struct_size = config->struct_size;
memset(config, 0, sizeof(*config));
- config->struct_size = struct_size;
-
- PyStatus status = preconfig_check_struct_size(config);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
config->_config_init = (int)_PyConfig_INIT_COMPAT;
config->parse_argv = 0;
@@ -313,18 +294,13 @@
#ifdef MS_WINDOWS
config->legacy_windows_fs_encoding = -1;
#endif
- return _PyStatus_OK();
}
-PyStatus
+void
PyPreConfig_InitPythonConfig(PyPreConfig *config)
{
- PyStatus status = _PyPreConfig_InitCompatConfig(config);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
+ _PyPreConfig_InitCompatConfig(config);
config->_config_init = (int)_PyConfig_INIT_PYTHON;
config->isolated = 0;
@@ -339,18 +315,13 @@
#ifdef MS_WINDOWS
config->legacy_windows_fs_encoding = 0;
#endif
- return _PyStatus_OK();
}
-PyStatus
+void
PyPreConfig_InitIsolatedConfig(PyPreConfig *config)
{
- PyStatus status = _PyPreConfig_InitCompatConfig(config);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
+ _PyPreConfig_InitCompatConfig(config);
config->_config_init = (int)_PyConfig_INIT_ISOLATED;
config->configure_locale = 0;
@@ -361,7 +332,6 @@
#ifdef MS_WINDOWS
config->legacy_windows_fs_encoding = 0;
#endif
- return _PyStatus_OK();
}
@@ -369,47 +339,35 @@
_PyPreConfig_InitFromPreConfig(PyPreConfig *config,
const PyPreConfig *config2)
{
- PyStatus status = PyPreConfig_InitPythonConfig(config);
- if (_PyStatus_EXCEPTION(status)) {
- return status;
- }
-
+ PyPreConfig_InitPythonConfig(config);
preconfig_copy(config, config2);
return _PyStatus_OK();
}
-PyStatus
+void
_PyPreConfig_InitFromConfig(PyPreConfig *preconfig, const PyConfig *config)
{
- PyStatus status;
_PyConfigInitEnum config_init = (_PyConfigInitEnum)config->_config_init;
switch (config_init) {
case _PyConfig_INIT_PYTHON:
- status = PyPreConfig_InitPythonConfig(preconfig);
+ PyPreConfig_InitPythonConfig(preconfig);
break;
case _PyConfig_INIT_ISOLATED:
- status = PyPreConfig_InitIsolatedConfig(preconfig);
+ PyPreConfig_InitIsolatedConfig(preconfig);
break;
case _PyConfig_INIT_COMPAT:
default:
- status = _PyPreConfig_InitCompatConfig(preconfig);
- }
-
- if (_PyStatus_EXCEPTION(status)) {
- return status;
+ _PyPreConfig_InitCompatConfig(preconfig);
}
_PyPreConfig_GetConfig(preconfig, config);
- return _PyStatus_OK();
}
static void
preconfig_copy(PyPreConfig *config, const PyPreConfig *config2)
{
- assert(config->struct_size == sizeof(PyPreConfig));
-
#define COPY_ATTR(ATTR) config->ATTR = config2->ATTR
COPY_ATTR(_config_init);
@@ -829,12 +787,6 @@
return status;
}
- status = preconfig_check_struct_size(config);
- if (_PyStatus_EXCEPTION(status)) {
- _PyStatus_UPDATE_FUNC(status);
- return status;
- }
-
preconfig_get_global_vars(config);
/* Copy LC_CTYPE locale, since it's modified later */
@@ -849,7 +801,6 @@
/* Save the config to be able to restore it if encodings change */
PyPreConfig save_config;
- save_config.struct_size = sizeof(PyPreConfig);
status = _PyPreConfig_InitFromPreConfig(&save_config, config);
if (_PyStatus_EXCEPTION(status)) {
@@ -976,7 +927,6 @@
_PyPreConfig_Write(const PyPreConfig *src_config)
{
PyPreConfig config;
- config.struct_size = sizeof(PyPreConfig);
PyStatus status = _PyPreConfig_InitFromPreConfig(&config, src_config);
if (_PyStatus_EXCEPTION(status)) {
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index c154d06..5174f74 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -731,7 +731,6 @@
runtime->preinitializing = 1;
PyPreConfig config;
- config.struct_size = sizeof(PyPreConfig);
status = _PyPreConfig_InitFromPreConfig(&config, src_config);
if (_PyStatus_EXCEPTION(status)) {
@@ -795,12 +794,8 @@
}
PyPreConfig preconfig;
- preconfig.struct_size = sizeof(PyPreConfig);
- status = _PyPreConfig_InitFromConfig(&preconfig, config);
- if (_PyStatus_EXCEPTION(status)) {
- return status;
- }
+ _PyPreConfig_InitFromConfig(&preconfig, config);
if (!config->parse_argv) {
return Py_PreInitialize(&preconfig);
@@ -848,7 +843,6 @@
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = _PyConfig_InitCompatConfig(&config);
if (_PyStatus_EXCEPTION(status)) {
@@ -1076,7 +1070,6 @@
}
PyConfig config;
- config.struct_size = sizeof(PyConfig);
status = _PyConfig_InitCompatConfig(&config);
if (_PyStatus_EXCEPTION(status)) {
diff --git a/Python/pystate.c b/Python/pystate.c
index f0662fa..098280d 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -61,11 +61,7 @@
_PyGC_Initialize(&runtime->gc);
_PyEval_Initialize(&runtime->ceval);
- runtime->preconfig.struct_size = sizeof(PyPreConfig);
- PyStatus status = PyPreConfig_InitPythonConfig(&runtime->preconfig);
- if (_PyStatus_EXCEPTION(status)) {
- return status;
- }
+ PyPreConfig_InitPythonConfig(&runtime->preconfig);
runtime->gilstate.check_enabled = 1;
@@ -210,7 +206,6 @@
interp->id_refcount = -1;
interp->check_interval = 100;
- interp->config.struct_size = sizeof(PyConfig);
PyStatus status = PyConfig_InitPythonConfig(&interp->config);
if (_PyStatus_EXCEPTION(status)) {
/* Don't report status to caller: PyConfig_InitPythonConfig()