From 4b98b044655d6ae2f37cf2493d91f07520970996 Mon Sep 17 00:00:00 2001
From: Jeremy Wright <wrightjmf@gmail.com>
Date: Mon, 8 Dec 2014 21:19:27 -0500
Subject: [PATCH] Fixed import errors inside one of the tests.

---
 tests/TestCadObjects.py | 56 ++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/tests/TestCadObjects.py b/tests/TestCadObjects.py
index a188e36..7e89bd9 100644
--- a/tests/TestCadObjects.py
+++ b/tests/TestCadObjects.py
@@ -1,13 +1,7 @@
 #system modules
 import sys
-
 import unittest
 from tests import BaseTest
-
-#from cadquery.freecad_impl.verutil import fc_import
-# FreeCAD = fc_import("FreeCAD")
-# if not hasattr(FreeCAD, 'Part'):
-#     FreeCAD.Part = fc_import("FreeCAD.Part")
 import FreeCAD
 import Part
 
@@ -17,54 +11,54 @@ from cadquery import *
 class TestCadObjects(BaseTest):
 
     def testVectorConstructors(self):
-        v1 = Vector(1,2,3)
-        v2 = Vector((1,2,3))
-        v3 = Vector(FreeCAD.Base.Vector(1,2,3))
+        v1 = Vector(1, 2, 3)
+        v2 = Vector((1, 2, 3))
+        v3 = Vector(FreeCAD.Base.Vector(1, 2, 3))
 
-        for v in [v1,v2,v3]:
-            self.assertTupleAlmostEquals((1,2,3),v.toTuple(),4)
+        for v in [v1, v2, v3]:
+            self.assertTupleAlmostEquals((1, 2, 3), v.toTuple(), 4)
 
     def testVertex(self):
         """
             Tests basic vertex functions
         """
-        v = Vertex( FreeCAD.Part.Vertex(1,1,1) )
-        self.assertEqual(1,v.X)
-        self.assertEquals(Vector,type(v.Center() ))
+        v = Vertex(Part.Vertex(1, 1, 1))
+        self.assertEqual(1, v.X)
+        self.assertEquals(Vector, type(v.Center()))
 
     def testBasicBoundingBox(self):
-        v = Vertex( FreeCAD.Part.Vertex(1,1,1))
-        v2 = Vertex( FreeCAD.Part.Vertex(2,2,2))
-        self.assertEquals(BoundBox,type(v.BoundingBox()))
-        self.assertEquals(BoundBox,type(v2.BoundingBox()))
+        v = Vertex(Part.Vertex(1, 1, 1))
+        v2 = Vertex(Part.Vertex(2, 2, 2))
+        self.assertEquals(BoundBox, type(v.BoundingBox()))
+        self.assertEquals(BoundBox, type(v2.BoundingBox()))
 
         bb1 = v.BoundingBox().add(v2.BoundingBox())
 
-        self.assertEquals(bb1.xlen,1.0)
+        self.assertEquals(bb1.xlen, 1.0)
 
     def testEdgeWrapperCenter(self):
-        e = Edge( FreeCAD.Part.makeCircle(2.0,FreeCAD.Base.Vector(1,2,3)) )
+        e = Edge(Part.makeCircle(2.0, FreeCAD.Base.Vector(1, 2, 3)))
 
-        self.assertTupleAlmostEquals((1.0,2.0,3.0),e.Center().toTuple(),3)
+        self.assertTupleAlmostEquals((1.0, 2.0, 3.0), e.Center().toTuple(), 3)
 
     def testDot(self):
-        v1 = Vector(2,2,2)
-        v2 = Vector(1,-1,1)
-        self.assertEquals(2.0,v1.dot(v2))
+        v1 = Vector(2, 2, 2)
+        v2 = Vector(1, -1, 1)
+        self.assertEquals(2.0, v1.dot(v2))
 
     def testVectorAdd(self):
-        result = Vector(1,2,0) + Vector(0,0,3)
-        self.assertTupleAlmostEquals((1.0,2.0,3.0),result.toTuple(),3)
+        result = Vector(1, 2, 0) + Vector(0, 0, 3)
+        self.assertTupleAlmostEquals((1.0, 2.0, 3.0), result.toTuple(), 3)
 
     def testTranslate(self):
-        e = Shape.cast( FreeCAD.Part.makeCircle(2.0,FreeCAD.Base.Vector(1,2,3)) )
-        e2 = e.translate(Vector(0,0,1))
+        e = Shape.cast(Part.makeCircle(2.0, FreeCAD.Base.Vector(1, 2, 3)))
+        e2 = e.translate(Vector(0, 0, 1))
 
-        self.assertTupleAlmostEquals((1.0,2.0,4.0),e2.Center().toTuple(),3)
+        self.assertTupleAlmostEquals((1.0, 2.0, 4.0), e2.Center().toTuple(), 3)
 
     def testVertices(self):
-        e = Shape.cast(FreeCAD.Part.makeLine((0,0,0),(1,1,0)))
-        self.assertEquals(2,len(e.Vertices()))
+        e = Shape.cast(Part.makeLine((0, 0, 0), (1, 1, 0)))
+        self.assertEquals(2, len(e.Vertices()))
 
 if __name__ == '__main__':
     unittest.main()