mirror of
https://github.com/python/cpython.git
synced 2026-06-28 13:50:17 -04:00
[3.15] gh-151253: Dump the Python path configuration on _PyCodec_InitRegistry() failure (#151250) (#151269)
gh-151253: Dump the Python path configuration on _PyCodec_InitRegistry() failure (#151250)
If "import encodings" fails at Python startup, dump the Python path
configuration to help users debugging their configuration. The
encodings module is the first module imported during Python startup.
(cherry picked from commit 7b6e98911e)
This commit is contained in:
@@ -10,6 +10,7 @@ Copyright (c) Corporation for National Research Initiatives.
|
||||
|
||||
#include "Python.h"
|
||||
#include "pycore_call.h" // _PyObject_CallNoArgs()
|
||||
#include "pycore_initconfig.h" // _Py_DumpPathConfig()
|
||||
#include "pycore_interp.h" // PyInterpreterState.codec_search_path
|
||||
#include "pycore_pyerrors.h" // _PyErr_FormatNote()
|
||||
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
||||
@@ -1685,6 +1686,8 @@ _PyCodec_InitRegistry(PyInterpreterState *interp)
|
||||
// search functions, so this is done after everything else is initialized.
|
||||
PyObject *mod = PyImport_ImportModule("encodings");
|
||||
if (mod == NULL) {
|
||||
PyThreadState *tstate = _PyThreadState_GET();
|
||||
_Py_DumpPathConfig(tstate);
|
||||
return PyStatus_Error("Failed to import encodings module");
|
||||
}
|
||||
Py_DECREF(mod);
|
||||
|
||||
Reference in New Issue
Block a user