Make full path construction windows compliant.

Author: SergioRAgostinho

test/test_material.py

@@ -3,12 +3,14 @@
 
 import pywavefront.material
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestMaterial(unittest.TestCase):
     def setUp(self):
         # Append current path to locate files
-        folder = os.path.dirname(__file__) + '/'
-        self.material = pywavefront.material.Material(folder + 'material')
-        self.material.set_texture(folder + '4x4.png')
+        self.material = pywavefront.material.Material(prepend_dir('material'))
+        self.material.set_texture(prepend_dir('4x4.png'))
 
     def testSetTexture(self):
         "Running set_texture should set a texture."

test/test_parser.py

@@ -3,11 +3,13 @@
 
 import pywavefront.parser
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestParsers(unittest.TestCase):
     def setUp(self):
         # Append current path to locate files
-        folder = os.path.dirname(__file__) + '/'
-        meshes = pywavefront.Wavefront(folder + 'simple.obj')
+        meshes = pywavefront.Wavefront(prepend_dir('simple.obj'))
         self.mesh1 = meshes.mesh_list[0]
         self.mesh2 = meshes.mesh_list[1]
 
@@ -37,8 +39,7 @@ def testObjMaterials(self):
 class TestMtlParser(unittest.TestCase):
     def setUp(self):
         # Append current path to locate files
-        self.folder = os.path.dirname(__file__) + '/'
-        meshes = pywavefront.Wavefront(self.folder + 'simple.obj')
+        meshes = pywavefront.Wavefront(prepend_dir('simple.obj'))
         self.material1 = meshes.mesh_list[0].materials[0]
         self.material2 = meshes.mesh_list[1].materials[0]
 
@@ -70,17 +71,14 @@ def testMtlTextureName(self):
         "Parsing an obj file with known material texture should set its name."
         # also tests d
         self.assertEqual(self.material1.texture.image_name,
-                         self.folder + '4x4.png')
+                         prepend_dir('4x4.png'))
 
 class TestParserFailure(unittest.TestCase):
-    def setUp(self):
-        # Append current path to locate files
-        self.folder = os.path.dirname(__file__) + '/'
 
     def testMissingParseFunction(self):
         "Attempting to parse with a missing parse function should raise an exception."
         # since no parse functions have been defined, this will always fail
-        self.assertRaises(Exception, pywavefront.parser.Parser, self.folder + 'uv_sphere.obj')
+        self.assertRaises(Exception, pywavefront.parser.Parser, prepend_dir('uv_sphere.obj'))
 
     def testMissingParsedFile(self):
         "Referencing a missing parsed file should raise an exception."

test/test_texture.py

@@ -3,18 +3,19 @@
 
 import pywavefront.texture
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestTexture(unittest.TestCase):
-    def setUp(self):
-        self.folder = os.path.dirname(__file__) + '/'
 
     def testPathedImageName(self):
         "For Texture objects, the image name should be the last component of the path."
-        my_texture = pywavefront.texture.Texture(self.folder + '4x4.png')
-        self.assertEqual(my_texture.image_name, self.folder + '4x4.png')
+        my_texture = pywavefront.texture.Texture(prepend_dir('4x4.png'))
+        self.assertEqual(my_texture.image_name, prepend_dir('4x4.png'))
 
     def testNonPowerOfTwoImage(self):
         "Texture images that have a non-power-of-two dimension should raise an exception."
-        self.assertRaises(Exception, pywavefront.texture.Texture, self.folder + '3x4.png')
+        self.assertRaises(Exception, pywavefront.texture.Texture, prepend_dir('3x4.png'))
 
     def testMissingFile(self):
         "Referencing a missing texture file should raise an exception."

test/test_wavefront.py

@@ -3,12 +3,14 @@
 
 import pywavefront
 
+def prepend_dir(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
 class TestWavefront(unittest.TestCase):
     def setUp(self):
-        folder = os.path.dirname(__file__) + '/'
         self.mesh_names = ['Simple', 'SimpleB']
         self.material_names = ['Material.simple', 'Material2.simple']
-        self.meshes = pywavefront.Wavefront(folder + 'simple.obj')
+        self.meshes = pywavefront.Wavefront(prepend_dir('simple.obj'))
 
     def testMaterials(self):
         "Ensure parsed wavefront materials match known values."
@@ -39,36 +41,31 @@ def testMeshMaterialVertices(self):
         self.assertEqual(len(self.meshes.meshes[self.mesh_names[0]].materials[0].vertices), 24)
 
 class TestBrokenWavefront(unittest.TestCase):
-    def setUp(self):
-        self.folder = os.path.dirname(__file__) + '/'
 
     def testUnknownUsemtl(self):
         "Referencing an unknown material with usemtl should raise an exception."
         self.assertRaises(pywavefront.PywavefrontException,
-                pywavefront.Wavefront, self.folder + 'simple_unknown_usemtl.obj')
+                pywavefront.Wavefront, prepend_dir('simple_unknown_usemtl.obj'))
 
     def testMissingNormals(self):
         "If there are texture coordinates but no normals, should raise an exception."
         self.assertRaises(pywavefront.PywavefrontException,
-                pywavefront.Wavefront, self.folder + 'simple_missing_normals.obj')
+                pywavefront.Wavefront, prepend_dir('simple_missing_normals.obj'))
 
 class TestNoMaterial(TestWavefront):
     def setUp(self):
-        folder = os.path.dirname(__file__) + '/'
         # reset the obj file to new file with no mtl line
         self.mesh_names = ['Simple', 'SimpleB']
         self.material_names = [None]
-        self.meshes = pywavefront.Wavefront(folder + 'simple_no_mtl.obj')
+        self.meshes = pywavefront.Wavefront(prepend_dir('simple_no_mtl.obj'))
 
     def testMeshMaterialVertices(self):
         "Mesh vertices should have known values."
         self.assertEqual(len(self.meshes.meshes[self.mesh_names[0]].materials[0].vertices), 48)
 
 class TestNoObjectNoMaterial(TestNoMaterial):
     def setUp(self):
-        folder = os.path.dirname(__file__) + '/'
-
         # reset the obj file to new file with no mtl line
         self.mesh_names = [None]
         self.material_names = [None]
-        self.meshes = pywavefront.Wavefront(folder + 'simple_no_object_no_mtl.obj')
+        self.meshes = pywavefront.Wavefront(prepend_dir('simple_no_object_no_mtl.obj'))