Merge 16da1ff into 1c86a97

cadquery/freecad_impl/importers.py

@@ -39,12 +39,16 @@ def importStep(fileName):
     try:
         rshape = Part.read(fileName)
 
-        #Make sure that we extract all the solids
-        solids = []
+        # Extract all solids and surfaces
+        geometry = []
         for solid in rshape.Solids:
-            solids.append(Shape.cast(solid))
+            geometry.append(Shape.cast(solid))
+
+        for shell in rshape.Shells:
+            geometry.append(Shape.cast(shell))
+
+        return cadquery.Workplane("XY").newObject(geometry)
 
-        return cadquery.Workplane("XY").newObject(solids)
     except:
         raise ValueError("STEP File Could not be loaded")
 
@@ -64,13 +68,7 @@ def importStepFromURL(url):
         webFile.close()
         tempFile.close()
 
-        rshape = Part.read(tempFile.name)
-
-        #Make sure that we extract all the solids
-        solids = []
-        for solid in rshape.Solids:
-            solids.append(Shape.cast(solid))
-
-        return cadquery.Workplane("XY").newObject(solids)
+        # Read saved file and return CQ Workplane object
+        return importStep(tempFile.name)
     except:
         raise ValueError("STEP File from the URL: " + url + " Could not be loaded")