diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-09-23 13:59:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 13:59:00 (GMT) |
| commit | c5c642565e260477ae2fb29d0c86a91e19702ae3 (patch) | |
| tree | b0ff8adcdf73332394a51288b3c9cef7373a9117 /Include | |
| parent | fe9089a08b6dd6dd1ba8b238afc2fc4dfaac689e (diff) | |
| download | cpython-c5c642565e260477ae2fb29d0c86a91e19702ae3.zip cpython-c5c642565e260477ae2fb29d0c86a91e19702ae3.tar.gz cpython-c5c642565e260477ae2fb29d0c86a91e19702ae3.tar.bz2 | |
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)
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/internal/pycore_pathconfig.h | 1 | ||||
| -rw-r--r-- | Include/internal/pycore_pylifecycle.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Include/internal/pycore_pathconfig.h b/Include/internal/pycore_pathconfig.h index a2c488c..61b3790 100644 --- a/Include/internal/pycore_pathconfig.h +++ b/Include/internal/pycore_pathconfig.h @@ -60,6 +60,7 @@ extern wchar_t* _Py_GetDLLPath(void); #endif extern PyStatus _PyPathConfig_Init(void); +extern void _Py_DumpPathConfig(PyThreadState *tstate); #ifdef __cplusplus } diff --git a/Include/internal/pycore_pylifecycle.h b/Include/internal/pycore_pylifecycle.h index 852280e..cb568d2 100644 --- a/Include/internal/pycore_pylifecycle.h +++ b/Include/internal/pycore_pylifecycle.h @@ -19,7 +19,7 @@ extern int _Py_SetFileSystemEncoding( const char *encoding, const char *errors); extern void _Py_ClearFileSystemEncoding(void); -extern PyStatus _PyUnicode_InitEncodings(PyInterpreterState *interp); +extern PyStatus _PyUnicode_InitEncodings(PyThreadState *tstate); #ifdef MS_WINDOWS extern int _PyUnicode_EnableLegacyWindowsFSEncoding(void); #endif |