Improve conditional trimesh use

clbarnes · Dec 21, 2023 · 8726672 · 8726672
1 parent c0d7db1
commit 8726672
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/python/ncollpyde/main.py b/python/ncollpyde/main.py
@@ -7,11 +7,6 @@
 import numpy as np
 from numpy.typing import ArrayLike, NDArray
 
-try:
-    import trimesh
-except ImportError:
-    trimesh = None
-
 from ._ncollpyde import (
     TriMeshWrapper,
     _index,
@@ -136,7 +131,9 @@ def __init__(
     def _validate(
         self, vertices: np.ndarray, triangles: np.ndarray
     ) -> Tuple[NDArray[np.float64], NDArray[np.uint32]]:
-        if trimesh:
+        try:
+            import trimesh
+
             tm = trimesh.Trimesh(vertices, triangles, validate=True)
             if not tm.is_volume:
                 logger.info("Mesh not valid, attempting to fix")
@@ -150,8 +147,7 @@ def _validate(
                     )
 
             return tm.vertices.astype(self.dtype), tm.faces.astype(np.uint32)
-
-        else:
+        except ImportError:
             warnings.warn("trimesh not installed; full validation not possible")
 
             if vertices.shape[1:] != (3,):