summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-09-23 12:45:47 (GMT)
committerGitHub <noreply@github.com>2019-09-23 12:45:47 (GMT)
commitfcdb027234566c4d506d6d753c7d5638490fb088 (patch)
treef2de660712a5fb27687ffbc804e63bc3c445d961 /PC
parentb4d0b39a9b4cd203bcc5b236dc96456e9658119a (diff)
downloadcpython-fcdb027234566c4d506d6d753c7d5638490fb088.zip
cpython-fcdb027234566c4d506d6d753c7d5638490fb088.tar.gz
cpython-fcdb027234566c4d506d6d753c7d5638490fb088.tar.bz2
bpo-38236: Dump path config at first import error (GH-16300)
Python now dumps path configuration if it fails to import the Python codecs of the filesystem and stdio encodings.
Diffstat (limited to 'PC')
-rw-r--r--PC/getpathp.c5
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;
}