From c5c642565e260477ae2fb29d0c86a91e19702ae3 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 23 Sep 2019 15:59:00 +0200 Subject: bpo-38236: Dump path config at first import error (GH-16300) (GH-16332) Python now dumps path configuration if it fails to import the Python codecs of the filesystem and stdio encodings. (cherry picked from commit fcdb027234566c4d506d6d753c7d5638490fb088) --- Python/pylifecycle.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Python/pylifecycle.c') diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index a9a6589d7a..4d7873fd52 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -941,7 +941,8 @@ pyinit_main(_PyRuntimeState *runtime, PyInterpreterState *interp) return status; } - status = _PyUnicode_InitEncodings(interp); + PyThreadState *tstate = _PyRuntimeState_GetThreadState(runtime); + status = _PyUnicode_InitEncodings(tstate); if (_PyStatus_EXCEPTION(status)) { return status; } @@ -1508,7 +1509,7 @@ new_interpreter(PyThreadState **tstate_p) return status; } - status = _PyUnicode_InitEncodings(interp); + status = _PyUnicode_InitEncodings(tstate); if (_PyStatus_EXCEPTION(status)) { return status; } -- cgit v1.2.1