bpo-36900: Replace global conf vars with config (GH-13299)
Replace global configuration variables with core_config read from the
current interpreter.
Cleanup dynload_hpux.c.
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 014b19a..4e74e0b 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -150,12 +150,13 @@
PyObject *importlib;
PyObject *impmod;
PyObject *value;
+ int verbose = interp->core_config.verbose;
/* Import _importlib through its frozen version, _frozen_importlib. */
if (PyImport_ImportFrozenModule("_frozen_importlib") <= 0) {
return _Py_INIT_ERR("can't import _frozen_importlib");
}
- else if (Py_VerboseFlag) {
+ else if (verbose) {
PySys_FormatStderr("import _frozen_importlib # frozen\n");
}
importlib = PyImport_AddModule("_frozen_importlib");
@@ -175,7 +176,7 @@
if (impmod == NULL) {
return _Py_INIT_ERR("can't import _imp");
}
- else if (Py_VerboseFlag) {
+ else if (verbose) {
PySys_FormatStderr("import _imp # builtin\n");
}
if (_PyImport_SetModuleString("_imp", impmod) < 0) {