From: Filipe Laíns Date: Mon, 9 Mar 2026 19:37:33 +0000 (+0000) Subject: GH-145273: don't skip missing platstdlib warning if stdlib_zip is found (#145544) X-Git-Tag: v3.15.0a7~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64d6c75dd02718e3554657a0c58c39122bf229ec;p=thirdparty%2FPython%2Fcpython.git GH-145273: don't skip missing platstdlib warning if stdlib_zip is found (#145544) --- diff --git a/Modules/getpath.py b/Modules/getpath.py index 2f4d635a2958..4dceb5cdc8df 100644 --- a/Modules/getpath.py +++ b/Modules/getpath.py @@ -776,9 +776,9 @@ elif not pythonpath_was_set: # Warn if the standard library is missing, unless pythonpath_was_set was set, as # that skips parts of the stdlib directories calculation — assume the provided # pythonpath is correct. This is how subinterpreters initialize the path for eg. -if not py_setpath and not pythonpath_was_set and (not stdlib_zip or not isfile(stdlib_zip)): +if not py_setpath and not pythonpath_was_set: home_hint = f"The Python 'home' directory was set to {home!r}, is this correct?" - if not stdlib_dir or not isdir(stdlib_dir): + if (not stdlib_zip or not isfile(stdlib_zip)) and (not stdlib_dir or not isdir(stdlib_dir)): hint = home_hint if home else f'sys.prefix is set to {prefix}, is this correct?' warn('WARN: Could not find the standard library directory! ' + hint) elif not platstdlib_dir or not isdir(platstdlib_dir):