python-discovery 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

python_discovery/_discovery.py

@@ -314,13 +314,7 @@ class LazyPathDump:
             content += " with =>"
             for file_path in self.path.iterdir():
                 try:
-                    if file_path.is_dir():
-                        continue
-                    if IS_WIN:  # pragma: win32 cover
-                        pathext = self.env.get("PATHEXT", ".COM;.EXE;.BAT;.CMD").split(";")
-                        if not any(file_path.name.upper().endswith(ext) for ext in pathext):
-                            continue
-                    elif not (file_path.stat().st_mode & os.X_OK):
+                    if not self._is_executable(file_path):
                         continue
                 except OSError:
                     pass
@@ -328,6 +322,14 @@ class LazyPathDump:
                 content += file_path.name
         return content
 
+    def _is_executable(self, file_path: Path) -> bool:
+        if file_path.is_dir():
+            return False
+        if IS_WIN:  # pragma: win32 cover
+            pathext = self.env.get("PATHEXT", ".COM;.EXE;.BAT;.CMD").split(";")
+            return any(file_path.name.upper().endswith(ext) for ext in pathext)
+        return bool(file_path.stat().st_mode & os.X_OK)
+
 
 def path_exe_finder(
     spec: PythonSpec, *, all_implementations: bool = False

python_discovery/_py_info.py

@@ -16,6 +16,7 @@ from string import digits
 from typing import TYPE_CHECKING, ClassVar, Final, NamedTuple
 
 if TYPE_CHECKING:
+    import tkinter as tk
     from collections.abc import Generator, Mapping
 
     from ._cache import PyInfoCache
@@ -165,42 +166,37 @@ class PythonInfo:  # noqa: PLR0904
             try:
                 tcl = tk.Tcl()
                 tcl_lib = tcl.eval("info library")
-
-                # Try to get TK library path directly first
-                try:
-                    tk_lib = tcl.eval("set tk_library")
-                    if tk_lib and os.path.isdir(tk_lib):
-                        pass  # We found it directly
-                    else:
-                        tk_lib = None  # Reset if invalid
-                except tk.TclError:
-                    tk_lib = None
-
-                # If direct query failed, try constructing the path
-                if tk_lib is None:
-                    tk_version = tcl.eval("package require Tk")
-                    tcl_parent = os.path.dirname(tcl_lib)
-
-                    # Try different version formats
-                    version_variants = [
-                        tk_version,  # Full version like "8.6.12"
-                        ".".join(tk_version.split(".")[:2]),  # Major.minor like "8.6"
-                        tk_version.split(".")[0],  # Just major like "8"
-                    ]
-
-                    for version in version_variants:
-                        tk_lib_path = os.path.join(tcl_parent, f"tk{version}")
-                        if not os.path.isdir(tk_lib_path):
-                            continue
-                        if os.path.exists(os.path.join(tk_lib_path, "tk.tcl")):
-                            tk_lib = tk_lib_path
-                            break
-
+                tk_lib = PythonInfo._resolve_tk_lib(tcl, tcl_lib)
             except tk.TclError:
                 pass
 
         return tcl_lib, tk_lib
 
+    @staticmethod
+    def _query_tk_library(tcl: tk.Tk) -> str | None:  # pragma: no cover
+        """Try to get the TK library path directly from Tcl."""
+        import tkinter as tk  # noqa: PLC0415
+
+        try:
+            if (tk_lib := tcl.eval("set tk_library")) and os.path.isdir(tk_lib):
+                return tk_lib
+        except tk.TclError:
+            pass
+        return None
+
+    @staticmethod
+    def _resolve_tk_lib(tcl: tk.Tk, tcl_lib: str) -> str | None:  # pragma: no cover
+        """Resolve the TK library path by direct query or path construction."""
+        if (tk_lib := PythonInfo._query_tk_library(tcl)) is not None:
+            return tk_lib
+        tk_version = tcl.eval("package require Tk")
+        tcl_parent = os.path.dirname(tcl_lib)
+        for version in (tk_version, ".".join(tk_version.split(".")[:2]), tk_version.split(".")[0]):
+            tk_lib_path = os.path.join(tcl_parent, f"tk{version}")
+            if os.path.isdir(tk_lib_path) and os.path.exists(os.path.join(tk_lib_path, "tk.tcl")):
+                return tk_lib_path
+        return None
+
     def _fast_get_system_executable(self) -> str | None:
         """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

python_discovery/_py_spec.py

@@ -17,7 +17,7 @@ PATTERN = re.compile(
     (?P<version>[0-9.]+)?           # version (e.g. 3.12, 3.12.1)
     (?P<threaded>t)?                # free-threaded flag
     (?:-(?P<arch>32|64))?           # architecture bitness
-    (?:-(?P<machine>[a-zA-Z0-9_]+))?  # ISA (e.g. arm64, x86_64)
+    (?:-(?P<machine>[a-zA-Z0-9_.]+))?  # ISA (e.g. arm64, x86_64, i86pc.64bit)
     $
     """,
     re.VERBOSE,

python_discovery/_windows/_pep514.py

@@ -124,23 +124,23 @@ def load_exe(hive_name: str, company: str, company_key: Any, tag: str) -> tuple[
     key_path = f"{hive_name}/{company}/{tag}"
     try:
         with winreg.OpenKeyEx(company_key, rf"{tag}\InstallPath") as ip_key, ip_key:  # ty: ignore[unresolved-attribute]
-            exe = get_value(ip_key, "ExecutablePath")
-            if exe is None:
-                ip = get_value(ip_key, None)
-                if ip is None:
-                    msg(key_path, "no ExecutablePath or default for it")
-
-                else:
-                    exe = os.path.join(ip, "python.exe")
-            if exe is not None and os.path.exists(exe):
-                args = get_value(ip_key, "ExecutableArguments")
-                return exe, args
+            if (exe := _resolve_exe(ip_key, key_path)) is not None and os.path.exists(exe):
+                return exe, get_value(ip_key, "ExecutableArguments")
             msg(key_path, f"could not load exe with value {exe}")
     except OSError:
         msg(f"{key_path}/InstallPath", "missing")
     return None
 
 
+def _resolve_exe(ip_key: Any, key_path: str) -> str | None:  # noqa: ANN401
+    if (exe := get_value(ip_key, "ExecutablePath")) is not None:
+        return exe
+    if (ip := get_value(ip_key, None)) is None:
+        msg(key_path, "no ExecutablePath or default for it")
+        return None
+    return os.path.join(ip, "python.exe")
+
+
 def load_arch_data(hive_name: str, company: str, tag: str, tag_key: Any, default_arch: int) -> int | None:  # noqa: ANN401
     arch_str = get_value(tag_key, "SysArchitecture")
     if arch_str is not None:

{python_discovery-1.3.1.dist-info → python_discovery-1.3.2.dist-info}/METADATA

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

@@ -2,15 +2,15 @@ python_discovery/__init__.py,sha256=Hi4j3pMvC8Fo8KoNL-wOHsPSCUHwY4c0qvv5sjnFzME,
 python_discovery/_cache.py,sha256=bG4fD-h2pdPmb4v9BldbXmJ5Tlt1boiH1Qrz8kp9Dds,5063
 python_discovery/_cached_py_info.py,sha256=1AFEoc_-OaCi1PXmaFz9Iy_bEuqOhJdFSDFHljzD-EE,8540
 python_discovery/_compat.py,sha256=iqxGuhK9rPaiui80G1H1KrweoMJ16gyLYEmUrSXrp5c,709
-python_discovery/_discovery.py,sha256=tlcmGDsOL8zitSSQSws9cXYt6MKT6ENiVtfAjQBzBtw,16820
-python_discovery/_py_info.py,sha256=Z6wFPjiQTxiAWMxguWKw-iP7oTurGcT3pKDpL8I3imc,34535
-python_discovery/_py_spec.py,sha256=apFN9Eux4BPMLE2LWd9WBCS3XbM7zu7H9V1-iIBpa6I,10407
+python_discovery/_discovery.py,sha256=cdo6xlktNMEwsQn2R8pn4T1VDE4LD2EJPUyCT7vlHnM,16830
+python_discovery/_py_info.py,sha256=ls4ZOe93RCsfjN2uEz1r4l3K8m-rtm3ZKRp59xJDJHg,34354
+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=JYSQ5tOYbSMOKtVVfOEkyYskBhEoTsImNr3DJcv7XNE,7658
+python_discovery/_windows/_pep514.py,sha256=zXxje07QIXfrCB3eYbZHOBgXcvAQQpZ-ZWun3_zrapA,7688
 python_discovery/_windows/_propose.py,sha256=iMJf6l0TU4SvuV8UsCHHINAe9L5dUT949xyeyMVdong,1565
-python_discovery-1.3.1.dist-info/METADATA,sha256=1NNrmgsOvtUf7FM3R7Al-ByD1bo4s3WQ5UtkWeYv-lw,5592
-python_discovery-1.3.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_discovery-1.3.1.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
-python_discovery-1.3.1.dist-info/RECORD,,
+python_discovery-1.3.2.dist-info/METADATA,sha256=nmMtjtmWU2DTdKudFjFa6Nrtlwk3OEDbB_BkeRYaw5A,5592
+python_discovery-1.3.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+python_discovery-1.3.2.dist-info/licenses/LICENSE,sha256=kOJeH68qSq6o2V7o5_VziwUqGswMnFgGgQH5Mahr1Yg,1023
+python_discovery-1.3.2.dist-info/RECORD,,