diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-05-14 15:34:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 15:34:56 (GMT) |
| commit | c96be811fa7da8ddcea18cc7abcae94e0f5ff966 (patch) | |
| tree | f3c6833ba92a084dc604498aecef6ef9103d6dfa /Python/pylifecycle.c | |
| parent | 3c93153f7db5dd9b06f229e61978fd9199b3c097 (diff) | |
| download | cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.zip cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.tar.gz cpython-c96be811fa7da8ddcea18cc7abcae94e0f5ff966.tar.bz2 | |
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.
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 @@ init_importlib(PyInterpreterState *interp, PyObject *sysmod) 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 @@ init_importlib(PyInterpreterState *interp, PyObject *sysmod) 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) { |