python-discovery 1.5.2__py3-none-any.whl → 1.5.3__py3-none-any.whl

python_discovery/_py_info_collect.py

@@ -198,25 +198,30 @@ class PythonInfoCollector:
 
     def _fast_get_system_executable(self):
         """Try to get the system executable by just looking at properties."""
-        # if we're not in a virtual environment, this is already a system python, so return the original executable
-        # note we must choose the original and not the pure executable as shim scripts might throw us off
+        # Preserve the invoked path because shims may rely on it.
         if not (self.real_prefix or (self.base_prefix is not None and self.base_prefix != self.prefix)):
             return self._resolve_executable_symlink(self.original_executable)
 
-        # if this is NOT a virtual environment, can't determine easily, bail out
         if self.real_prefix is not None:
             return None
 
-        base_executable = getattr(sys, "_base_executable", None)  # some platforms may set this to help us
-        if base_executable is None:  # use the saved system executable if present
+        base_executable = getattr(sys, "_base_executable", None)
+        if base_executable is None:
             return None
 
-        # we know we're in a virtual environment, can not be us
         if sys.executable == base_executable:
             return None
 
-        # We're not in a venv and base_executable exists; use it directly
+        # CPython accepts pythonX without checking its version when resolving a copied venv.
         if os.path.exists(base_executable):  # pragma: >=3.11 cover
+            major = self.version_info.major
+            ambiguous_names = {"python", "python{}".format(major)}
+            if self.implementation == "PyPy":
+                ambiguous_names.update({"pypy", "pypy3", "pypy{}".format(major)})
+            if os.path.basename(base_executable) in ambiguous_names:
+                versioned = self._try_posix_versioned_executable(base_executable)
+                if versioned is not None and not os.path.samefile(base_executable, versioned):
+                    base_executable = versioned
             return self._resolve_executable_symlink(base_executable)
 
         # Try fallback for POSIX virtual environments
@@ -259,28 +264,48 @@ class PythonInfoCollector:
 
     def _try_posix_fallback_executable(self, base_executable):
         """Find a versioned Python binary as fallback for POSIX virtual environments."""
+        versioned = self._try_posix_versioned_executable(base_executable)
+        if versioned is not None:
+            return versioned
+
+        major, minor = self.version_info.major, self.version_info.minor
+        if self.os != "posix" or (major, minor) < (3, 11):
+            return None
+
+        base_dir = os.path.dirname(base_executable)
+        candidates = ["python{}".format(major)]
+        if self.implementation == "PyPy":
+            candidates.extend(["pypy", "pypy3", "pypy{}".format(major)])
+
+        for candidate in candidates:
+            full_path = os.path.join(base_dir, candidate)
+            if os.path.exists(full_path):
+                return full_path
+
+        return None
+
+    def _try_posix_versioned_executable(self, base_executable):
         major, minor = self.version_info.major, self.version_info.minor
         if self.os != "posix" or (major, minor) < (3, 11):
             return None
 
-        # search relative to the directory of sys._base_executable
         base_dir = os.path.dirname(base_executable)
-        candidates = ["python{}".format(major), "python{}.{}".format(major, minor)]
+        candidates = ["python{}.{}".format(major, minor)]
         if self.implementation == "PyPy":
-            candidates.extend(["pypy", "pypy3", "pypy{}".format(major), "pypy{}.{}".format(major, minor)])
+            candidates.insert(0, "pypy{}.{}".format(major, minor))
 
         for candidate in candidates:
             full_path = os.path.join(base_dir, candidate)
             if os.path.exists(full_path):
                 return full_path
 
-        return None  # in this case we just can't tell easily without poking around FS and calling them, bail
+        return None
 
     @staticmethod
     def _distutils_install():  # pragma: <3.11 cover # 3.11+ uses the "venv" scheme instead
         # use distutils primarily because that's what pip does
         # https://github.com/pypa/pip/blob/main/src/pip/_internal/locations.py#L95
-        # note here we don't import Distribution directly to allow setuptools to patch it
+        # Avoid importing Distribution before setuptools can patch it.
         with warnings.catch_warnings():  # disable warning for PEP-632
             warnings.simplefilter("ignore")
             try:

{python_discovery-1.5.2.dist-info → python_discovery-1.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-discovery
-Version: 1.5.2
+Version: 1.5.3
 Summary: Python interpreter discovery
 Project-URL: Changelog, https://github.com/tox-dev/python-discovery/releases
 Project-URL: Documentation, https://python-discovery.readthedocs.io

{python_discovery-1.5.2.dist-info → python_discovery-1.5.3.dist-info}/RECORD

@@ -4,14 +4,14 @@ python_discovery/_cached_py_info.py,sha256=MKV2sjrrypq-7gcOdw9GpAooMJl9kYCTAlYeU
 python_discovery/_compat.py,sha256=iqxGuhK9rPaiui80G1H1KrweoMJ16gyLYEmUrSXrp5c,709
 python_discovery/_discovery.py,sha256=ABPD8MRweUO6B7cG3U3ZBfUIYs08rh6dYPA225EURyY,22032
 python_discovery/_py_info.py,sha256=XX4yM6TVhTMFfmahNMekT7Y3Zy12Zy0IAfmz_xFRceU,25284
-python_discovery/_py_info_collect.py,sha256=NSh00CS1UHI6_fbXrXUi-vlvFAEOix2NnC7Is10Taeg,15439
+python_discovery/_py_info_collect.py,sha256=YhF5U-kKcwMXZMfRNDlZK6kCPJJI9tHIvd5SjQqMJqY,16126
 python_discovery/_py_spec.py,sha256=O1RMC9JQ7m5SRzF6cEELxnIWZpadXYWO4bWDD7TemUs,10965
 python_discovery/_specifier.py,sha256=o7MHb0z_mFSLz9gXqMwJoNkHYjgi2biq3Ibvd0_slvc,10457
 python_discovery/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_discovery/_windows/__init__.py,sha256=qthcyGh36b3WkeSbZ4ECRRYLbCOCaQu5X_DRZ98tXfk,315
 python_discovery/_windows/_pep514.py,sha256=1TqLTdofSCPu3VFE7D4u2fXweyaqhKJR7b48VmJ9AQQ,7787
 python_discovery/_windows/_propose.py,sha256=iMJf6l0TU4SvuV8UsCHHINAe9L5dUT949xyeyMVdong,1565
-python_discovery-1.5.2.dist-info/METADATA,sha256=4kPFZVceJ_w4hP8AKPig_59eT502_O4NEzjeTyjMECw,5132
-python_discovery-1.5.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-python_discovery-1.5.2.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
-python_discovery-1.5.2.dist-info/RECORD,,
+python_discovery-1.5.3.dist-info/METADATA,sha256=RcMFPQt1KzopnhBQlUIjMC18xeM-te8dXAsUwKI6D2Y,5132
+python_discovery-1.5.3.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_discovery-1.5.3.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
+python_discovery-1.5.3.dist-info/RECORD,,