updated OCC imports

Author: kshitij-maths

pygem/cad/cad_deformation.py

@@ -7,12 +7,11 @@
 from itertools import product
 from OCC.Core.TopoDS import (
     TopoDS_Shape,
-    topods_Wire,
     TopoDS_Compound,
-    topods_Face,
-    topods_Edge,
     TopoDS_Face,
+    TopoDS_Edge,
     TopoDS_Wire,
+    topods
 )
 from OCC.Core.BRep import BRep_Builder
 from OCC.Core.TopExp import TopExp_Explorer
@@ -195,7 +194,7 @@ def _bspline_surface_from_face(self, face):
         if not isinstance(face, TopoDS_Face):
             raise TypeError("face must be a TopoDS_Face")
         # TopoDS_Face converted to Nurbs
-        nurbs_face = topods_Face(BRepBuilderAPI_NurbsConvert(face).Shape())
+        nurbs_face = topods.Face(BRepBuilderAPI_NurbsConvert(face).Shape())
         # GeomSurface obtained from Nurbs face
         surface = BRep_Tool.Surface(nurbs_face)
         # surface is now further converted to a bspline surface
@@ -221,7 +220,7 @@ def _bspline_curve_from_wire(self, wire):
         edge_explorer = TopExp_Explorer(wire, TopAbs_EDGE)
         while edge_explorer.More():
             # getting the edge from the iterator
-            edge = topods_Edge(edge_explorer.Current())
+            edge = topods.Edge(edge_explorer.Current())
 
             # edge can be joined only if it is not degenerated (zero length)
             if BRep_Tool.Degenerated(edge):
@@ -231,7 +230,7 @@ def _bspline_curve_from_wire(self, wire):
             # the edge must be converted to Nurbs edge
             nurbs_converter = BRepBuilderAPI_NurbsConvert(edge)
             nurbs_converter.Perform(edge)
-            nurbs_edge = topods_Edge(nurbs_converter.Shape())
+            nurbs_edge = topods.Edge(nurbs_converter.Shape())
 
             # here we extract the underlying curve from the Nurbs edge
             nurbs_curve = BRep_Tool_Curve(nurbs_edge)[0]
@@ -408,7 +407,7 @@ def __call__(self, obj, dst=None):
             # performing some conversions to get the right
             # format (BSplineSurface)
             # TopoDS_Face obtained from iterator
-            face = topods_Face(faces_explorer.Current())
+            face = topods.Face(faces_explorer.Current())
             # performing some conversions to get the right
             # format (BSplineSurface)
             bspline_surface = self._bspline_surface_from_face(face)
@@ -438,7 +437,7 @@ def __call__(self, obj, dst=None):
             wire_explorer = TopExp_Explorer(face, TopAbs_WIRE)
             while wire_explorer.More():
                 # wire obtained from the iterator
-                wire = topods_Wire(wire_explorer.Current())
+                wire = topods.Wire(wire_explorer.Current())
 
                 # getting a bpline curve joining all the edges of the wire
                 composite_curve = self._bspline_curve_from_wire(wire)