diff options
author | Victor Stinner <vstinner@python.org> | 2019-09-28 02:50:43 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-28 02:50:43 (GMT) |
commit | 6e128382b3e7f83d91d5e73d83a051ff5fb6469c (patch) | |
tree | 905eefc6e339bede369de52a8e9ae97c9bebb6be /Python/pathconfig.c | |
parent | 8750bce9884335d43ac06989f64473ed877c5b63 (diff) | |
download | cpython-6e128382b3e7f83d91d5e73d83a051ff5fb6469c.zip cpython-6e128382b3e7f83d91d5e73d83a051ff5fb6469c.tar.gz cpython-6e128382b3e7f83d91d5e73d83a051ff5fb6469c.tar.bz2 |
bpo-38304: Add PyConfig.struct_size (GH-16451) (GH-16453)
Add a new struct_size field to PyPreConfig and PyConfig structures to
allow to modify these structures in the future without breaking the
backward compatibility.
* Replace private _config_version field with public struct_size field
in PyPreConfig and PyConfig.
* Public PyPreConfig_InitIsolatedConfig() and
PyPreConfig_InitPythonConfig()
return type becomes PyStatus, instead of void.
* Internal _PyConfig_InitCompatConfig(),
_PyPreConfig_InitCompatConfig(), _PyPreConfig_InitFromConfig(),
_PyPreConfig_InitFromPreConfig() return type becomes PyStatus,
instead of void.
* Remove _Py_CONFIG_VERSION
* Update the Initialization Configuration documentation.
(cherry picked from commit 441b10cf2855955c86565f8d59e72c2efc0f0a57)
Diffstat (limited to 'Python/pathconfig.c')
-rw-r--r-- | Python/pathconfig.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Python/pathconfig.c b/Python/pathconfig.c index d5b8b1a..41ef7d2 100644 --- a/Python/pathconfig.c +++ b/Python/pathconfig.c @@ -434,7 +434,12 @@ pathconfig_global_read(_PyPathConfig *pathconfig) { PyStatus status; PyConfig config; - _PyConfig_InitCompatConfig(&config); + config.struct_size = sizeof(PyConfig); + + status = _PyConfig_InitCompatConfig(&config); + if (_PyStatus_EXCEPTION(status)) { + goto done; + } /* Call _PyConfig_InitPathConfig() */ status = PyConfig_Read(&config); |