use Path from pathlib everywhere. drop path dep

Author: greyltc

cadquery/assembly.py

@@ -15,6 +15,7 @@
 from typish import instance_of
 from uuid import uuid1 as uuid
 from warnings import warn
+from pathlib import Path
 
 from .cq import Workplane
 from .occ_impl.shapes import Shape, Compound, isSubshape
@@ -47,6 +48,7 @@
 
 PATH_DELIM = "/"
 
+
 # entity selector grammar definition
 def _define_grammar():
 
@@ -507,7 +509,7 @@ def solve(self, verbosity: int = 0) -> Self:
     @deprecate()
     def save(
         self,
-        path: str,
+        path: Path,
         exportType: Optional[ExportLiterals] = None,
         mode: STEPExportModeLiterals = "default",
         tolerance: float = 0.1,
@@ -534,7 +536,7 @@ def save(
 
     def export(
         self,
-        path: str,
+        path: Path,
         exportType: Optional[ExportLiterals] = None,
         mode: STEPExportModeLiterals = "default",
         tolerance: float = 0.1,
@@ -560,7 +562,7 @@ def export(
             raise ValueError(f"Unknown assembly export mode {mode} for STEP")
 
         if exportType is None:
-            t = path.split(".")[-1].upper()
+            t = path.suffix.upper().lstrip(".")
             if t in ("STEP", "XML", "XBF", "VRML", "VTKJS", "GLTF", "GLB", "STL"):
                 exportType = cast(ExportLiterals, t)
             else:
@@ -591,7 +593,7 @@ def export(
         return self
 
     @classmethod
-    def importStep(cls, path: str) -> Self:
+    def importStep(cls, path: Path) -> Self:
         """
         Reads an assembly from a STEP file.
 
@@ -602,13 +604,13 @@ def importStep(cls, path: str) -> Self:
         return cls.load(path, importType="STEP")
 
     @classmethod
-    def load(cls, path: str, importType: Optional[ImportLiterals] = None,) -> Self:
+    def load(cls, path: Path, importType: Optional[ImportLiterals] = None,) -> Self:
         """
         Load step, xbf or xml.
         """
 
         if importType is None:
-            t = path.split(".")[-1].upper()
+            t = path.suffix.upper().lstrip(".")
             if t in ("STEP", "XML", "XBF"):
                 importType = cast(ImportLiterals, t)
             else:
@@ -680,8 +682,12 @@ def __iter__(
         color = self.color if self.color else color
 
         if self.obj:
-            yield self.obj if isinstance(self.obj, Shape) else Compound.makeCompound(
-                s for s in self.obj.vals() if isinstance(s, Shape)
+            yield (
+                self.obj
+                if isinstance(self.obj, Shape)
+                else Compound.makeCompound(
+                    s for s in self.obj.vals() if isinstance(s, Shape)
+                )
             ), name, loc, color
 
         for ch in self.children:

cadquery/cq.py

@@ -21,6 +21,7 @@
 )
 from typing_extensions import Literal
 from inspect import Parameter, Signature
+from pathlib import Path
 
 
 from .occ_impl.geom import Vector, Plane, Location
@@ -4582,7 +4583,7 @@ def invoke(
 
     def export(
         self: T,
-        fname: str,
+        fname: Path,
         tolerance: float = 0.1,
         angularTolerance: float = 0.1,
         opt: Optional[Dict[str, Any]] = None,

cadquery/occ_impl/exporters/__init__.py

@@ -1,6 +1,7 @@
 import tempfile
 import os
 import io as StringIO
+from pathlib import Path
 
 from typing import IO, Optional, Union, cast, Dict, Any, Iterable
 from typing_extensions import Literal
@@ -39,13 +40,12 @@ class ExportTypes:
 
 def export(
     w: Union[Shape, Iterable[Shape]],
-    fname: str,
+    fname: Path,
     exportType: Optional[ExportLiterals] = None,
     tolerance: float = 0.1,
     angularTolerance: float = 0.1,
     opt: Optional[Dict[str, Any]] = None,
 ):
-
     """
     Export Workplane or Shape to file. Multiple entities are converted to compound.
 
@@ -69,7 +69,7 @@ def export(
         shape = compound(*w)
 
     if exportType is None:
-        t = fname.split(".")[-1].upper()
+        t = fname.suffix.upper().lstrip(".")
         if t in ExportTypes.__dict__.values():
             exportType = cast(ExportLiterals, t)
         else:
@@ -121,7 +121,7 @@ def export(
 
     elif exportType == ExportTypes.VRML:
         shape.mesh(tolerance, angularTolerance)
-        VrmlAPI.Write_s(shape.wrapped, fname)
+        VrmlAPI.Write_s(shape.wrapped, str(fname))
 
     elif exportType == ExportTypes.VTP:
         exportVTP(shape, fname, tolerance, angularTolerance)
@@ -205,9 +205,9 @@ def tessellate(shape, angularTolerance):
         os.close(h)
 
         if exportType == ExportTypes.STEP:
-            shape.exportStep(outFileName)
+            shape.exportStep(Path(outFileName))
         elif exportType == ExportTypes.STL:
-            shape.exportStl(outFileName, tolerance, angularTolerance, True)
+            shape.exportStl(Path(outFileName), tolerance, angularTolerance, True)
         else:
             raise ValueError("No idea how i got here")
 

cadquery/occ_impl/exporters/assembly.py

@@ -1,10 +1,10 @@
-import os.path
 import uuid
 
 from tempfile import TemporaryDirectory
 from shutil import make_archive
 from typing import Optional
 from typing_extensions import Literal
+from pathlib import Path
 
 from vtkmodules.vtkIOExport import vtkJSONSceneExporter, vtkVRMLExporter
 from vtkmodules.vtkRenderingCore import vtkRenderWindow
@@ -50,7 +50,7 @@ class ExportModes:
 
 def exportAssembly(
     assy: AssemblyProtocol,
-    path: str,
+    path: Path,
     mode: STEPExportModeLiterals = "default",
     **kwargs,
 ) -> bool:
@@ -102,14 +102,14 @@ def exportAssembly(
     Interface_Static.SetIVal_s("write.stepcaf.subshapes.name", 1)
     writer.Transfer(doc, STEPControl_StepModelType.STEPControl_AsIs)
 
-    status = writer.Write(path)
+    status = writer.Write(str(path))
 
     return status == IFSelect_ReturnStatus.IFSelect_RetDone
 
 
 def exportStepMeta(
     assy: AssemblyProtocol,
-    path: str,
+    path: Path,
     write_pcurves: bool = True,
     precision_mode: int = 0,
 ) -> bool:
@@ -161,10 +161,12 @@ def _process_child(child: AssemblyProtocol, assy_label: TDF_Label):
         # Collect all of the shapes in the child object
         if child.obj:
             child_items = (
-                child.obj
-                if isinstance(child.obj, Shape)
-                else Compound.makeCompound(
-                    s for s in child.obj.vals() if isinstance(s, Shape)
+                (
+                    child.obj
+                    if isinstance(child.obj, Shape)
+                    else Compound.makeCompound(
+                        s for s in child.obj.vals() if isinstance(s, Shape)
+                    )
                 ),
                 child.name,
                 child.loc,
@@ -268,19 +270,20 @@ def _process_assembly(
     Interface_Static.SetIVal_s("write.precision.mode", precision_mode)
     writer.Transfer(doc, STEPControl_StepModelType.STEPControl_AsIs)
 
-    status = writer.Write(path)
+    status = writer.Write(str(path))
 
     return status == IFSelect_ReturnStatus.IFSelect_RetDone
 
 
-def exportCAF(assy: AssemblyProtocol, path: str, binary: bool = False) -> bool:
+def exportCAF(assy: AssemblyProtocol, path: Path, binary: bool = False) -> bool:
     """
     Export an assembly to an XCAF xml or xbf file (internal OCCT formats).
     """
 
-    folder, fname = os.path.split(path)
-    name, ext = os.path.splitext(fname)
-    ext = ext[1:] if ext[0] == "." else ext
+    folder = path.parent
+    fname = path.name
+    name = path.stem
+    ext = path.suffix.lstrip(".")
 
     _, doc = toCAF(assy, binary=binary)
     app = XCAFApp_Application.GetApplication_s()
@@ -308,10 +311,10 @@ def exportCAF(assy: AssemblyProtocol, path: str, binary: bool = False) -> bool:
         format_name, format_desc, TCollection_AsciiString(ext), ret, store,
     )
 
-    doc.SetRequestedFolder(TCollection_ExtendedString(folder))
+    doc.SetRequestedFolder(TCollection_ExtendedString(str(folder)))
     doc.SetRequestedName(TCollection_ExtendedString(name))
 
-    status = app.SaveAs(doc, TCollection_ExtendedString(path))
+    status = app.SaveAs(doc, TCollection_ExtendedString(str(path)))
 
     app.Close(doc)
 
@@ -335,7 +338,7 @@ def _vtkRenderWindow(
     return renderWindow
 
 
-def exportVTKJS(assy: AssemblyProtocol, path: str):
+def exportVTKJS(assy: AssemblyProtocol, path: Path):
     """
     Export an assembly to a zipped vtkjs. NB: .zip extensions is added to path.
     """
@@ -348,12 +351,12 @@ def exportVTKJS(assy: AssemblyProtocol, path: str):
         exporter.SetFileName(tmpdir)
         exporter.SetRenderWindow(renderWindow)
         exporter.Write()
-        make_archive(path, "zip", tmpdir)
+        make_archive(str(path), "zip", tmpdir)
 
 
 def exportVRML(
     assy: AssemblyProtocol,
-    path: str,
+    path: Path,
     tolerance: float = 1e-3,
     angularTolerance: float = 0.1,
 ):
@@ -362,14 +365,14 @@ def exportVRML(
     """
 
     exporter = vtkVRMLExporter()
-    exporter.SetFileName(path)
+    exporter.SetFileName(str(path))
     exporter.SetRenderWindow(_vtkRenderWindow(assy, tolerance, angularTolerance))
     exporter.Write()
 
 
 def exportGLTF(
     assy: AssemblyProtocol,
-    path: str,
+    path: Path,
     binary: Optional[bool] = None,
     tolerance: float = 1e-3,
     angularTolerance: float = 0.1,
@@ -382,10 +385,10 @@ def exportGLTF(
     if binary is None:
         # Handle the binary option for GLTF export based on file extension
         binary = True
-        path_parts = path.split(".")
+        sfx = path.suffix.lstrip(".").lower()
 
         # Binary will be the default if the user specified a non-standard file extension
-        if len(path_parts) > 0 and path_parts[-1] == "gltf":
+        if sfx == "gltf":
             binary = False
 
     # map from CadQuery's right-handed +Z up coordinate system to glTF's right-handed +Y up coordinate system
@@ -395,7 +398,7 @@ def exportGLTF(
 
     _, doc = toCAF(assy, True, True, tolerance, angularTolerance)
 
-    writer = RWGltf_CafWriter(TCollection_AsciiString(path), binary)
+    writer = RWGltf_CafWriter(TCollection_AsciiString(str(path)), binary)
     result = writer.Perform(
         doc, TColStd_IndexedDataMapOfStringString(), Message_ProgressRange()
     )

cadquery/occ_impl/exporters/dxf.py

@@ -20,6 +20,7 @@
 from OCP.gp import gp_Dir
 from OCP.GC import GC_MakeArcOfEllipse
 from typing_extensions import Self
+from pathlib import Path
 
 from ...units import RAD2DEG
 from ..shapes import Face, Edge, Shape, Compound, compound
@@ -366,7 +367,7 @@ def _dxf_spline(cls, edge: Edge, plane: Plane) -> DxfEntityAttributes:
 
 def exportDXF(
     w: Union[WorkplaneLike, Shape, Iterable[Shape]],
-    fname: str,
+    fname: Path,
     approx: Optional[ApproxOptions] = None,
     tolerance: float = 1e-3,
     *,

cadquery/occ_impl/exporters/vtk.py

@@ -1,13 +1,14 @@
 from vtkmodules.vtkIOXML import vtkXMLPolyDataWriter
 from ..shapes import Shape
+from pathlib import Path
 
 
 def exportVTP(
-    shape: Shape, fname: str, tolerance: float = 0.1, angularTolerance: float = 0.1
+    shape: Shape, fname: Path, tolerance: float = 0.1, angularTolerance: float = 0.1
 ):
 
     writer = vtkXMLPolyDataWriter()
-    writer.SetFileName(fname)
+    writer.SetFileName(str(fname))
     writer.SetInputData(shape.toVtkPolyData(tolerance, angularTolerance))
     writer.Write()