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 /PC/getpathp.c | |
| 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 'PC/getpathp.c')
| -rw-r--r-- | PC/getpathp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/PC/getpathp.c b/PC/getpathp.c index 0ee5308..888bef1 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -532,8 +532,7 @@ _Py_GetDLLPath(void) static PyStatus -get_program_full_path(const PyConfig *config, - PyCalculatePath *calculate, _PyPathConfig *pathconfig) +get_program_full_path(_PyPathConfig *pathconfig) { const wchar_t *pyvenv_launcher; wchar_t program_full_path[MAXPATHLEN+1]; @@ -977,7 +976,7 @@ calculate_path_impl(const PyConfig *config, { PyStatus status; - status = get_program_full_path(config, calculate, pathconfig); + status = get_program_full_path(pathconfig); if (_PyStatus_EXCEPTION(status)) { return status; } |