python-discovery 1.4.0__py3-none-any.whl → 1.4.2__py3-none-any.whl

python_discovery/_py_info.py

@@ -204,7 +204,7 @@ class PythonInfo:  # noqa: PLR0904
         # 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
         if not (self.real_prefix or (self.base_prefix is not None and self.base_prefix != self.prefix)):
-            return self.original_executable
+            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:
@@ -220,11 +220,48 @@ class PythonInfo:  # noqa: PLR0904
 
         # We're not in a venv and base_executable exists; use it directly
         if os.path.exists(base_executable):  # pragma: >=3.11 cover
-            return base_executable
+            return self._resolve_executable_symlink(base_executable)
 
         # Try fallback for POSIX virtual environments
         return self._try_posix_fallback_executable(base_executable)  # pragma: >=3.11 cover
 
+    def _resolve_executable_symlink(self, path: str, *, framework: bool | None = None) -> str:
+        """
+        Resolve symlinks of the executable itself, but never of its parent directories.
+
+        Mirrors CPython's ``getpath.realpath`` (and ``venv`` in python/cpython#115237): an executable-only symlink
+        resolves to the real interpreter so its home can be located, while a fully symlinked interpreter tree is
+        kept as-is. Like ``getpath``, resolution stops as soon as the stdlib landmark is reachable from the current
+        directory - an alias such as Debian's ``/usr/bin/python3`` is a usable home and stays untouched.
+        """
+        result = os.path.abspath(path)
+        if self.os != "posix":  # CPython only does this where HAVE_READLINK
+            return result
+        if framework is None:
+            framework = bool(sysconfig.get_config_var("PYTHONFRAMEWORK"))
+        if framework:  # macOS framework builds self-locate via dyld from the real binary; e.g. for Homebrew
+            return result  # resolving would pin the versioned Cellar path into the recorded home
+        real_path = os.path.realpath(result)
+        if not os.path.exists(real_path):  # symlink loop or broken symlink
+            return result
+        while os.path.islink(result):
+            if self._stdlib_landmark_exists(os.path.dirname(result)):
+                return result
+            link = os.readlink(result)
+            candidate = link if os.path.isabs(link) else os.path.normpath(os.path.join(os.path.dirname(result), link))
+            # normpath through a symlinked directory may point at a different file - stop resolving there
+            if not (os.path.exists(candidate) and os.path.samefile(real_path, candidate)):
+                return result
+            result = candidate
+        return result
+
+    @staticmethod
+    def _stdlib_landmark_exists(dir_path: str) -> bool:
+        lib_name = os.path.basename(os.path.dirname(os.__file__))
+        return any(
+            os.path.exists(os.path.join(dir_path, os.pardir, lib, lib_name, "os.py")) for lib in ("lib", "lib64")
+        )
+
     def _try_posix_fallback_executable(self, base_executable: str) -> str | None:
         """Find a versioned Python binary as fallback for POSIX virtual environments."""
         major, minor = self.version_info.major, self.version_info.minor

{python_discovery-1.4.0.dist-info → python_discovery-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-discovery
-Version: 1.4.0
+Version: 1.4.2
 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.4.0.dist-info → python_discovery-1.4.2.dist-info}/RECORD

@@ -3,14 +3,14 @@ python_discovery/_cache.py,sha256=bG4fD-h2pdPmb4v9BldbXmJ5Tlt1boiH1Qrz8kp9Dds,50
 python_discovery/_cached_py_info.py,sha256=1AFEoc_-OaCi1PXmaFz9Iy_bEuqOhJdFSDFHljzD-EE,8540
 python_discovery/_compat.py,sha256=iqxGuhK9rPaiui80G1H1KrweoMJ16gyLYEmUrSXrp5c,709
 python_discovery/_discovery.py,sha256=cdo6xlktNMEwsQn2R8pn4T1VDE4LD2EJPUyCT7vlHnM,16830
-python_discovery/_py_info.py,sha256=XZGBI0hVIG54tjgVGX-5ZwNUuDv_RoIhEj0mBsT1R9I,34467
+python_discovery/_py_info.py,sha256=7RAPxig94jjhEU_tqR7rWIgVe4c4sy517qcWylr-nCA,36654
 python_discovery/_py_spec.py,sha256=Kky0LXi8BU_ojfMdvvRhtDk6I4WPjovwXOu6E2QYHTo,10421
 python_discovery/_specifier.py,sha256=PTh6suNTC0hMnFSxFYF_vggdciFLnwxoh1YflSbgCXA,10368
 python_discovery/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_discovery/_windows/__init__.py,sha256=qthcyGh36b3WkeSbZ4ECRRYLbCOCaQu5X_DRZ98tXfk,315
 python_discovery/_windows/_pep514.py,sha256=zXxje07QIXfrCB3eYbZHOBgXcvAQQpZ-ZWun3_zrapA,7688
 python_discovery/_windows/_propose.py,sha256=iMJf6l0TU4SvuV8UsCHHINAe9L5dUT949xyeyMVdong,1565
-python_discovery-1.4.0.dist-info/METADATA,sha256=VtlySRmCB_wZLirKeBUcSOMxKPufldx-ULtqt90Rd5k,5592
-python_discovery-1.4.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_discovery-1.4.0.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
-python_discovery-1.4.0.dist-info/RECORD,,
+python_discovery-1.4.2.dist-info/METADATA,sha256=Okvw-dTP972zFGoyhkWappE0MFoWJrExjbGjI-Wok_I,5592
+python_discovery-1.4.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+python_discovery-1.4.2.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
+python_discovery-1.4.2.dist-info/RECORD,,

{python_discovery-1.4.0.dist-info → python_discovery-1.4.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any