From d05b5164b2c7eb63cf70b5273202ad9fd8d11273 Mon Sep 17 00:00:00 2001 From: "Stephen M. McQuay" Date: Tue, 29 May 2012 17:33:28 -0600 Subject: [PATCH] Updated files to support py3 --- surf/geometry.py | 2 +- surf/subd/cc.py | 6 +++--- surf/test/edge.py | 5 +++-- surf/test/polymesh.py | 5 +++-- surf/test/subd/cc.py | 12 +++++++----- surf/test/test00.py | 4 ++-- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/surf/geometry.py b/surf/geometry.py index 554918c..090e2b7 100644 --- a/surf/geometry.py +++ b/surf/geometry.py @@ -119,7 +119,7 @@ class Vertex(list): return Vertex(-self.x, -self.y, -self.z) def __unicode__(self): - return u'V{0}'.format([self.x, self.y, self.z]) + return 'V{0}'.format([self.x, self.y, self.z]) __str__ = __unicode__ __repr__ = __unicode__ diff --git a/surf/subd/cc.py b/surf/subd/cc.py index 77e7fc5..54d0119 100644 --- a/surf/subd/cc.py +++ b/surf/subd/cc.py @@ -59,7 +59,7 @@ def refine(mesh): # For each original Vertex P, move the original Vertex to a new location # Here we mimic the F, R, and P spelling in the wiki article - for old_vid in xrange(f_vert_offset): + for old_vid in range(f_vert_offset): # take the average F of all n face Vertices for faces touching P ... F_verts = [] for old_fid in mesh.faces_for_vert[old_vid]: @@ -88,12 +88,12 @@ def refine(mesh): # For each face point, add an edge connecting the new face point to each # new edge point - for fvid, evids in evid_for_fvid.iteritems(): + for fvid, evids in evid_for_fvid.items(): for evid in evids: new_edges.append([fvid, evid]) # to define new faces need to know the following for each new face: - for fvid in xrange(f_vert_offset, e_vert_offset): + for fvid in range(f_vert_offset, e_vert_offset): # new face_vid (1 vid) # vid connected to fvid (iterate over, use 1 vid periteration) diff --git a/surf/test/edge.py b/surf/test/edge.py index c4aecba..99072ae 100644 --- a/surf/test/edge.py +++ b/surf/test/edge.py @@ -12,8 +12,9 @@ class TestEdge(unittest.TestCase): self.samples_dir = os.path.join(path, os.pardir, os.pardir, 'blender', 'samples') self.cube_file_name = os.path.join(self.samples_dir, 'cube.json') - cube_json = json.load(open(self.cube_file_name, 'r')) - self.cube = PolygonMesh(**cube_json) + with open(self.cube_file_name, 'r') as cube_file: + cube_json = json.load(cube_file) + self.cube = PolygonMesh(**cube_json) def test_centroid(self): e = self.cube.edges[0] diff --git a/surf/test/polymesh.py b/surf/test/polymesh.py index 8a319fb..e7500f8 100644 --- a/surf/test/polymesh.py +++ b/surf/test/polymesh.py @@ -11,8 +11,9 @@ class TestPM(unittest.TestCase): path, file_name = os.path.split(__file__) self.samples_dir = os.path.join(path, os.pardir, os.pardir, 'blender', 'samples') - self.cube_file_name = os.path.join(self.samples_dir, 'cube.json') - self.cube = json.load(open(self.cube_file_name, 'r')) + cube_file_name = os.path.join(self.samples_dir, 'cube.json') + with open(cube_file_name) as cube_file: + self.cube = json.load(cube_file) def test_cube_load(self): p = PolygonMesh(**self.cube) diff --git a/surf/test/subd/cc.py b/surf/test/subd/cc.py index 94fb0c8..242f6de 100644 --- a/surf/test/subd/cc.py +++ b/surf/test/subd/cc.py @@ -12,18 +12,20 @@ class TestCC(unittest.TestCase): path, file_name = os.path.split(__file__) self.samples_dir = os.path.join(path, os.pardir, os.pardir, os.pardir, 'blender', 'samples') - self.cube_file_name = os.path.join(self.samples_dir, 'cube.json') - self.cube = json.load(open(self.cube_file_name, 'r')) - self.cube_file_name = os.path.join(self.samples_dir, + cube_file_name = os.path.join(self.samples_dir, 'cube.json') + with open(cube_file_name, 'r') as cube_file: + self.cube = json.load(cube_file) + cube_file_name = os.path.join(self.samples_dir, 'cube-blender-cc-1.json') - self.cube1 = json.load(open(self.cube_file_name, 'r')) + with open(cube_file_name, 'r') as cube_file: + self.cube1 = json.load(cube_file) def test_refined_vertex_location(self): p = PolygonMesh(**self.cube) p2 = cc.refine(p) v2 = [list(i) for i in p2.vertices] for a, b in zip(sorted(self.cube1['vertices']), sorted(v2)): - for i in xrange(len(a)): + for i in range(len(a)): self.assertAlmostEqual(a[i], b[i]) def test_vert_count(self): diff --git a/surf/test/test00.py b/surf/test/test00.py index 0a03945..04fdc2b 100644 --- a/surf/test/test00.py +++ b/surf/test/test00.py @@ -2,10 +2,10 @@ from surf.util import cube from surf.subd import cc polygon = cube() -print polygon +print(polygon) refined_poly = cc.refine(polygon) -print refined_poly +print(refined_poly) # # # import pylab