bpo-32030: Add _PyMainInterpreterConfig.pythonhome (#4513)
* Py_Main() now reads the PYTHONHOME environment variable
* Add _Py_GetPythonHomeWithConfig() private function
* Add _PyWarnings_InitWithConfig()
* init_filters() doesn't get the current core configuration from the
current interpreter or Python thread anymore. Pass explicitly the
configuration to _PyWarnings_InitWithConfig().
* _Py_InitializeCore() now fails on _PyWarnings_InitWithConfig()
failure.
* Pass configuration as constant
diff --git a/Python/_warnings.c b/Python/_warnings.c
index d865f0a..36d649f 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -1185,10 +1185,9 @@
}
static PyObject *
-init_filters(void)
+init_filters(const _PyCoreConfig *config)
{
- PyInterpreterState *interp = PyThreadState_GET()->interp;
- int dev_mode = interp->core_config.dev_mode;
+ int dev_mode = config->dev_mode;
Py_ssize_t count = 2;
if (dev_mode) {
@@ -1264,8 +1263,8 @@
};
-PyMODINIT_FUNC
-_PyWarnings_Init(void)
+PyObject*
+_PyWarnings_InitWithConfig(const _PyCoreConfig *config)
{
PyObject *m;
@@ -1274,7 +1273,7 @@
return NULL;
if (_PyRuntime.warnings.filters == NULL) {
- _PyRuntime.warnings.filters = init_filters();
+ _PyRuntime.warnings.filters = init_filters(config);
if (_PyRuntime.warnings.filters == NULL)
return NULL;
}
@@ -1305,3 +1304,12 @@
_PyRuntime.warnings.filters_version = 0;
return m;
}
+
+
+PyMODINIT_FUNC
+_PyWarnings_Init(void)
+{
+ PyInterpreterState *interp = PyThreadState_GET()->interp;
+ const _PyCoreConfig *config = &interp->core_config;
+ return _PyWarnings_InitWithConfig(config);
+}
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 552501d..5bbbbc6 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -767,7 +767,9 @@
}
/* Initialize _warnings. */
- _PyWarnings_Init();
+ if (_PyWarnings_InitWithConfig(&interp->core_config) == NULL) {
+ return _Py_INIT_ERR("can't initialize warnings");
+ }
/* This call sets up builtin and frozen import support */
if (!interp->core_config._disable_importlib) {
@@ -880,7 +882,7 @@
return err;
}
- if (config->install_signal_handlers) {
+ if (interp->config.install_signal_handlers) {
err = initsigs(); /* Signal handling stuff, including initintr() */
if (_Py_INIT_FAILED(err)) {
return err;
@@ -1468,7 +1470,6 @@
}
static wchar_t *default_home = NULL;
-static wchar_t env_home[MAXPATHLEN+1];
void
Py_SetPythonHome(wchar_t *home)
@@ -1477,20 +1478,40 @@
}
wchar_t *
+_Py_GetPythonHomeWithConfig(const _PyMainInterpreterConfig *config)
+{
+ /* Use a static buffer to avoid heap memory allocation failure.
+ Py_GetPythonHome() doesn't allow to report error, and the caller
+ doesn't release memory. */
+ static wchar_t buffer[MAXPATHLEN+1];
+
+ if (default_home) {
+ return default_home;
+ }
+
+ if (config) {
+ return config->pythonhome;
+ }
+
+ char *home = Py_GETENV("PYTHONHOME");
+ if (!home) {
+ return NULL;
+ }
+
+ size_t size = Py_ARRAY_LENGTH(buffer);
+ size_t r = mbstowcs(buffer, home, size);
+ if (r == (size_t)-1 || r >= size) {
+ /* conversion failed or the static buffer is too small */
+ return NULL;
+ }
+
+ return buffer;
+}
+
+wchar_t *
Py_GetPythonHome(void)
{
- wchar_t *home = default_home;
- if (home == NULL && !Py_IgnoreEnvironmentFlag) {
- char* chome = Py_GETENV("PYTHONHOME");
- if (chome) {
- size_t size = Py_ARRAY_LENGTH(env_home);
- size_t r = mbstowcs(env_home, chome, size);
- if (r != (size_t)-1 && r < size)
- home = env_home;
- }
-
- }
- return home;
+ return _Py_GetPythonHomeWithConfig(NULL);
}
/* Add the __main__ module */