From dd10c22e14c7eaf05cd77a6e400351a463bd8c99 Mon Sep 17 00:00:00 2001 From: mikedh Date: Sat, 21 Jul 2018 17:14:10 -0400 Subject: [PATCH] python2 scope fix --- tests/test_paths.py | 2 +- trimesh/path/path.py | 4 ++-- trimesh/version.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_paths.py b/tests/test_paths.py index efaf2b944..efd760401 100644 --- a/tests/test_paths.py +++ b/tests/test_paths.py @@ -39,7 +39,7 @@ def test_discrete(self): assert d.md5() == md5 # make sure None polygons are not referenced in graph assert all(d.polygons_closed[i] is not None - for i in d.enclosure_directed.nodes) + for i in d.enclosure_directed.nodes()) # file_name should be populated, and if we have a DXF file # the layer field should be populated with layer names diff --git a/trimesh/path/path.py b/trimesh/path/path.py index f83f4fe62..2a6fa85fe 100644 --- a/trimesh/path/path.py +++ b/trimesh/path/path.py @@ -916,8 +916,8 @@ def polygons_full(self): for i, root in enumerate(self.root): # a list of multiple Polygon objects that # are fully contained by the root curve - children = [self.polygons_closed[i] - for i in enclosure[root].keys()] + children = [self.polygons_closed[child] + for child in enclosure[root].keys()] # all polygons_closed are CCW, so for interiors reverse them holes = [np.array(p.exterior.coords)[::-1] for p in children] # a single Polygon object diff --git a/trimesh/version.py b/trimesh/version.py index 734f01e11..436331742 100644 --- a/trimesh/version.py +++ b/trimesh/version.py @@ -1 +1 @@ -__version__ = '2.31.34' +__version__ = '2.31.36'