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 2f4d635a29585c2e69a21e5ce313d4510d0c35e2..4dceb5cdc8dfcf0b73fa8b71871d996f4cbc4098 100644 (file)
--- 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):