diff options
author | Victor Stinner <vstinner@redhat.com> | 2019-10-01 10:06:16 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-01 10:06:16 (GMT) |
commit | 8462a4936b3a551dc546a6adea04a70b0a07ca67 (patch) | |
tree | 3c4655f174d1aa9abcdb5226532db0e4d7434bca /Doc/c-api/init_config.rst | |
parent | 3c30a76f3d3c0dcc1fb4de097fa4a3a4c92c0b0b (diff) | |
download | cpython-8462a4936b3a551dc546a6adea04a70b0a07ca67.zip cpython-8462a4936b3a551dc546a6adea04a70b0a07ca67.tar.gz cpython-8462a4936b3a551dc546a6adea04a70b0a07ca67.tar.bz2 |
bpo-38304: PyConfig_InitPythonConfig() cannot fail anymore (GH-16509)
PyConfig_InitPythonConfig() and PyConfig_InitIsolatedConfig() no
longer return PyStatus: they cannot fail anymore.
Diffstat (limited to 'Doc/c-api/init_config.rst')
-rw-r--r-- | Doc/c-api/init_config.rst | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst index 15b8b94..5e18300 100644 --- a/Doc/c-api/init_config.rst +++ b/Doc/c-api/init_config.rst @@ -343,12 +343,12 @@ PyConfig Structure methods: - .. c:function:: PyStatus PyConfig_InitPythonConfig(PyConfig *config) + .. c:function:: void PyConfig_InitPythonConfig(PyConfig *config) Initialize configuration with :ref:`Python Configuration <init-python-config>`. - .. c:function:: PyStatus PyConfig_InitIsolatedConfig(PyConfig *config) + .. c:function:: void PyConfig_InitIsolatedConfig(PyConfig *config) Initialize configuration with :ref:`Isolated Configuration <init-isolated-conf>`. @@ -724,12 +724,9 @@ Example setting the program name:: void init_python(void) { PyStatus status; - PyConfig config; - status = PyConfig_InitPythonConfig(&config); - if (PyStatus_Exception(status)) { - goto fail; - } + PyConfig config; + PyConfig_InitPythonConfig(&config); /* Set the program name. Implicitly preinitialize Python. */ status = PyConfig_SetString(&config, &config.program_name, @@ -756,12 +753,9 @@ configuration, and then override some parameters:: PyStatus init_python(const char *program_name) { PyStatus status; - PyConfig config; - status = PyConfig_InitPythonConfig(&config); - if (PyStatus_Exception(status)) { - goto done; - } + PyConfig config; + PyConfig_InitPythonConfig(&config); /* Set the program name before reading the configuraton (decode byte string from the locale encoding). @@ -843,13 +837,9 @@ Example of customized Python always running in isolated mode:: int main(int argc, char **argv) { PyStatus status; - PyConfig config; - - status = PyConfig_InitPythonConfig(&config); - if (PyStatus_Exception(status)) { - goto fail; - } + PyConfig config; + PyConfig_InitPythonConfig(&config); config.isolated = 1; /* Decode command line arguments. @@ -1034,14 +1024,9 @@ phases:: void init_python(void) { PyStatus status; - PyConfig config; - - status = PyConfig_InitPythonConfig(&config); - if (PyStatus_Exception(status)) { - PyConfig_Clear(&config); - Py_ExitStatusException(status); - } + PyConfig config; + PyConfig_InitPythonConfig(&config); config._init_main = 0; /* ... customize 'config' configuration ... */ |