pyhabitat 1.0.21__tar.gz → 1.0.23__tar.gz

{pyhabitat-1.0.21 → pyhabitat-1.0.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhabitat
-Version: 1.0.21
+Version: 1.0.23
 Summary: A lightweight library for detecting system environment, GUI, and build properties.
 Author-email: George Clayton Bennett <george.bennett@memphistn.gov>
 License-Expression: MIT

{pyhabitat-1.0.21 → pyhabitat-1.0.23}/pyhabitat/environment.py

@@ -352,9 +352,10 @@ def is_elf(exec_path: Path | str | None = None, debug: bool = False, suppress_de
         # Check the magic number: The first four bytes of an ELF file are 0x7f, 'E', 'L', 'F' (b'\x7fELF').
         # This is the most reliable way to determine if the executable is a native binary wrapper (like PyInstaller's).
         magic_bytes = read_magic_bytes(exec_path, 4, debug and not suppress_debug)
-
+        if magic_bytes is None:
+            return False
         return magic_bytes == b'\x7fELF'
-    except Exception:
+    except (OSError, IOError) as e:
         if debug:
             logging.debug("False (Exception during file check)")
         return False
@@ -370,7 +371,7 @@ def is_pyz(exec_path: Path | str | None = None, debug: bool = False, suppress_de
     # Check if the extension is PYZ
     if not str(exec_path).endswith(".pyz"):
         if debug:
-            logging.debug("False (Not a .pyz file)")
+            logging.debug("is_pyz()=False (Not a .pyz file)")
         return False
 
     if not _check_if_zip(exec_path):
@@ -390,11 +391,17 @@ def is_windows_portable_executable(exec_path: Path | str | None = None, debug: b
     exec_path, is_valid = _check_executable_path(exec_path, debug and not suppress_debug)
     if not is_valid:
         return False
-    magic_bytes = read_magic_bytes(exec_path, 2, debug and not suppress_debug)
-    result = magic_bytes.startswith(b"MZ")
+    try:
+        magic_bytes = read_magic_bytes(exec_path, 2, debug and not suppress_debug)
+        if magic_bytes is  None:
+            return False
+        result = magic_bytes.startswith(b"MZ")
+        return result
+    except (OSError, IOError) as e:
+        if debug:
+            logging.debug(f"is_windows_portable_executable() = False (Exception: {e})")
+        return False
 
-    return result
-    
 def is_macos_executable(exec_path: Path | str | None = None, debug: bool = False, suppress_debug: bool =False) -> bool:
     """
     Checks if the currently running executable is a macOS/Darwin Mach-O binary, 
@@ -409,7 +416,8 @@ def is_macos_executable(exec_path: Path | str | None = None, debug: bool = False
         # Common ones are: b'\xfe\xed\xfa\xce' (32-bit) or b'\xfe\xed\xfa\xcf' (64-bit)
         
         magic_bytes = read_magic_bytes(exec_path, 4, debug and not suppress_debug)
-
+        if magic_bytes is None:
+            return False
         # Common Mach-O magic numbers (including their reversed-byte counterparts)
         MACHO_MAGIC = {
             b'\xfe\xed\xfa\xce',  # MH_MAGIC
@@ -423,11 +431,12 @@ def is_macos_executable(exec_path: Path | str | None = None, debug: bool = False
             
         return is_macho
         
-    except Exception:
+    except (OSError, IOError) as e:
         if debug:
-            logging.debug("False (Exception during file check)")
+            logging.debug("is_macos_executable() = False (Exception during file check)")
         return False
-    
+
+
 def is_pipx(exec_path: Path | str | None = None, debug: bool = False, suppress_debug: bool = True) -> bool:
     """Checks if the executable is running from a pipx managed environment."""
     exec_path, is_valid = _check_executable_path(exec_path, debug and not suppress_debug, check_pipx=False)
@@ -826,4 +835,4 @@ def main(path=None, debug=False):
     print("")
 
 if __name__ == "__main__": 
-    main(debug=True)
+    main(debug=True)

{pyhabitat-1.0.21 → pyhabitat-1.0.23}/pyhabitat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhabitat
-Version: 1.0.21
+Version: 1.0.23
 Summary: A lightweight library for detecting system environment, GUI, and build properties.
 Author-email: George Clayton Bennett <george.bennett@memphistn.gov>
 License-Expression: MIT

{pyhabitat-1.0.21 → pyhabitat-1.0.23}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyhabitat"
-version = "1.0.21"
+version = "1.0.23"
 #dynamic = ["version"] # 
 authors = [
   { name="George Clayton Bennett", email="george.bennett@memphistn.gov" },
@@ -30,6 +30,6 @@ pyhabitat = "pyhabitat.cli:run_cli"
 where = ["."]  
 include = ["pyhabitat*"] 
 
-[tool.setuptools_scm] 
-# This tells setuptools_scm to look at your git history/tags for the version
-write_to = "pyhabitat/_version.py"
+#[tool.setuptools_scm] 
+# This tells setuptools_scm to look at the git history/tags for the version
+#write_to = "pyhabitat/_version.py"