fix detection of python and pip executables on Windows

Author: radoering

src/poetry/utils/env/generic_env.py

@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING
 from typing import Any
 
+from poetry.utils._compat import WINDOWS
 from poetry.utils.env.script_strings import GET_PATHS
 from poetry.utils.env.virtual_env import VirtualEnv
 
@@ -39,6 +40,9 @@ def find_executables(self) -> None:
                 (f"python{major_version}", f"pip{major_version}"),
             ]
 
+        if WINDOWS:
+            patterns = [(f"{p[0]}.exe", f"{p[1]}.exe") for p in patterns]
+
         python_executable = None
         pip_executable = None
 

tests/utils/env/test_env.py

@@ -423,16 +423,14 @@ def test_env_finds_the_correct_executables_for_generic_env(
     venv = GenericEnv(parent_venv.path, child_env=VirtualEnv(child_venv_path))
 
     expected_executable = (
-        f"python{sys.version_info[0]}.{sys.version_info[1]}{'.exe' if WINDOWS else ''}"
+        "python.exe"
+        if WINDOWS
+        else f"python{sys.version_info[0]}.{sys.version_info[1]}"
     )
     expected_pip_executable = (
         f"pip{sys.version_info[0]}.{sys.version_info[1]}{'.exe' if WINDOWS else ''}"
     )
 
-    if WINDOWS:
-        expected_executable = "python.exe"
-        expected_pip_executable = "pip.exe"
-
     assert Path(venv.python).name == expected_executable
     assert Path(venv.pip).name == expected_pip_executable
 
@@ -458,14 +456,14 @@ def test_env_finds_fallback_executables_for_generic_env(
         and venv._bin_dir.joinpath(major_executable).exists()
     ):
         venv._bin_dir.joinpath(expected_executable).unlink()
-        expected_executable = major_executable
+    expected_executable = major_executable
 
     if (
         venv._bin_dir.joinpath(expected_executable).exists()
         and venv._bin_dir.joinpath(default_executable).exists()
     ):
         venv._bin_dir.joinpath(expected_executable).unlink()
-        expected_executable = default_executable
+    expected_executable = default_executable
 
     default_pip_executable = f"pip{'.exe' if WINDOWS else ''}"
     major_pip_executable = f"pip{sys.version_info[0]}{'.exe' if WINDOWS else ''}"
@@ -478,20 +476,14 @@ def test_env_finds_fallback_executables_for_generic_env(
         and venv._bin_dir.joinpath(major_pip_executable).exists()
     ):
         venv._bin_dir.joinpath(expected_pip_executable).unlink()
-        expected_pip_executable = major_pip_executable
+    expected_pip_executable = major_pip_executable
 
     if (
         venv._bin_dir.joinpath(expected_pip_executable).exists()
         and venv._bin_dir.joinpath(default_pip_executable).exists()
     ):
         venv._bin_dir.joinpath(expected_pip_executable).unlink()
-        expected_pip_executable = default_pip_executable
-
-    if not venv._bin_dir.joinpath(expected_executable).exists():
-        expected_executable = default_executable
-
-    if not venv._bin_dir.joinpath(expected_pip_executable).exists():
-        expected_pip_executable = default_pip_executable
+    expected_pip_executable = default_pip_executable
 
     venv = GenericEnv(parent_venv.path, child_env=VirtualEnv(child_venv_path))