summaryrefslogtreecommitdiffstats
path: root/Python/initconfig.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-08-23 17:03:08 (GMT)
committerGitHub <noreply@github.com>2019-08-23 17:03:08 (GMT)
commit120b707a6d43452e067daa55a8fdca69f9424abc (patch)
tree1a58f651b55fde0a820646fdbf8b568657883273 /Python/initconfig.c
parent1beb7c3de9c3d0e802e4267a11d937e8f024d661 (diff)
downloadcpython-120b707a6d43452e067daa55a8fdca69f9424abc.zip
cpython-120b707a6d43452e067daa55a8fdca69f9424abc.tar.gz
cpython-120b707a6d43452e067daa55a8fdca69f9424abc.tar.bz2
bpo-36763: PyConfig_Read() handles PySys_AddXOption() (GH-15431)
PyConfig_Read() is now responsible to handle early calls to PySys_AddXOption() and PySys_AddWarnOption(). Options added by PySys_AddXOption() are now handled the same way than PyConfig.xoptions and command line -X options. For example, PySys_AddXOption(L"faulthandler") enables faulthandler as expected.
Diffstat (limited to 'Python/initconfig.c')
-rw-r--r--Python/initconfig.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/Python/initconfig.c b/Python/initconfig.c
index b706f4c..87dea5e 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -2069,6 +2069,7 @@ config_init_warnoptions(PyConfig *config,
/* The priority order for warnings configuration is (highest precedence
* first):
*
+ * - early PySys_AddWarnOption() calls
* - the BytesWarning filter, if needed ('-b', '-bb')
* - any '-W' command line options; then
* - the 'PYTHONWARNINGS' environment variable; then
@@ -2124,6 +2125,13 @@ config_init_warnoptions(PyConfig *config,
return status;
}
}
+
+ /* Handle early PySys_AddWarnOption() calls */
+ status = _PySys_ReadPreinitWarnOptions(config);
+ if (_PyStatus_EXCEPTION(status)) {
+ return status;
+ }
+
return _PyStatus_OK();
}
@@ -2293,7 +2301,8 @@ config_read_cmdline(PyConfig *config)
}
status = config_init_warnoptions(config,
- &cmdline_warnoptions, &env_warnoptions);
+ &cmdline_warnoptions,
+ &env_warnoptions);
if (_PyStatus_EXCEPTION(status)) {
goto done;
}
@@ -2403,6 +2412,12 @@ PyConfig_Read(PyConfig *config)
goto done;
}
+ /* Handle early PySys_AddXOption() calls */
+ status = _PySys_ReadPreinitXOptions(config);
+ if (_PyStatus_EXCEPTION(status)) {
+ goto done;
+ }
+
status = config_read(config);
if (_PyStatus_EXCEPTION(status)) {
goto done;