chore: add some fail-safe checks (#2764)

marcelotduarte · Jan 2, 2025 · 3a655f5 · 3a655f5
1 parent 3f7815f
commit 3a655f5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/cx_Freeze/hooks/_qthooks.py b/cx_Freeze/hooks/_qthooks.py
@@ -395,12 +395,13 @@ def load_qt_qtwebenginecore(finder: ModuleFinder, module: Module) -> None:
         if environment == "conda":  # conda-forge Linux and macOS
             prefix = Path(sys.prefix)
             conda_meta = prefix / "conda-meta"
-            pkg = next(conda_meta.glob("nss-*.json"))
-            files = json.loads(pkg.read_text(encoding="utf_8"))["files"]
-            for file in files:
-                source = prefix / file
-                if source.match("lib*.so") or source.match("lib*.dylib"):
-                    finder.include_files(source, f"lib/{source.name}")
+            pkg = next(conda_meta.glob("nss-*.json"), None)
+            if pkg is not None:
+                files = json.loads(pkg.read_text(encoding="utf_8"))["files"]
+                for file in files:
+                    source = prefix / file
+                    if source.match("lib*.so") or source.match("lib*.dylib"):
+                        finder.include_files(source, f"lib/{source.name}")
         else:
             copy_qt_files(finder, name, "LibraryExecutablesPath", "libnss*.*")
 

diff --git a/cx_Freeze/hooks/numpy.py b/cx_Freeze/hooks/numpy.py
@@ -240,9 +240,8 @@ def load_numpy__distributor_init(finder: ModuleFinder, module: Module) -> None:
         blas_options = ["libopenblas", "mkl"]
         packages += blas_options
         for package in packages:
-            try:
-                pkg = next(conda_meta.glob(f"{package}-*.json"))
-            except StopIteration:
+            pkg = next(conda_meta.glob(f"{package}-*.json"), None)
+            if pkg is None:
                 continue
             files = json.loads(pkg.read_text(encoding="utf_8"))["files"]
             # copy mkl/blas files to lib (issue #2574)

diff --git a/cx_Freeze/hooks/tkinter.py b/cx_Freeze/hooks/tkinter.py
@@ -34,11 +34,8 @@ def load_tkinter(finder: ModuleFinder, module: Module) -> None:
         and lib_dynload_tkinter
         and lib_dynload_tkinter.exists()
     ):
-        try:
-            tcl_library = next(share.glob("tcl*.*"))
-            tk_library = next(share.glob("tk*.*"))
-        except StopIteration:
-            pass
+        tcl_library = next(share.glob("tcl*.*"), None)
+        tk_library = next(share.glob("tk*.*"), None)
     if tcl_library is None:
         # search for the tcl/tk libraries (Windows, MSYS2, conda-forge, etc)
         try:

diff --git a/tests/test_command_bdist_deb.py b/tests/test_command_bdist_deb.py
@@ -99,7 +99,8 @@ def test_bdist_deb_simple(datafiles: Path) -> None:
             pytest.fail(process.stderr)
 
     pattern = f"{name}_{version}-?_*.deb"
-    file_created = next(dist_created.glob(pattern))
+    file_created = next(dist_created.glob(pattern), None)
+    assert file_created, pattern
     assert file_created.is_file(), pattern
 
 
@@ -128,7 +129,8 @@ def test_bdist_deb_simple_pyproject(datafiles: Path) -> None:
             pytest.fail(process.stderr)
 
     pattern = f"{name}_{version}-?_*.deb"
-    file_created = next(dist_created.glob(pattern))
+    file_created = next(dist_created.glob(pattern), None)
+    assert file_created, pattern
     assert file_created.is_file(), pattern
 
 
@@ -156,5 +158,6 @@ def test_bdist_deb(datafiles: Path) -> None:
             pytest.fail(process.stderr)
 
     pattern = f"{name.replace('_', '-')}_{version}-?_*.deb"
-    file_created = next(dist_created.glob(pattern))
+    file_created = next(dist_created.glob(pattern), None)
+    assert file_created, pattern
     assert file_created.is_file(), pattern