From 714cdad3a23e3a1582f2ce4fb936cdd84c10a0cf Mon Sep 17 00:00:00 2001 From: DeepSOIC Date: Thu, 23 Nov 2017 14:10:18 +0300 Subject: [PATCH] Py3: fixes for lack of xrange --- CompoundFilter2.py | 6 +++--- lattice2ArrayFilter.py | 6 +++--- lattice2Subsequencer.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CompoundFilter2.py b/CompoundFilter2.py index 2fb2194..2f3995e 100644 --- a/CompoundFilter2.py +++ b/CompoundFilter2.py @@ -112,7 +112,7 @@ class _CompoundFilter: raise ValueError('index range cannot be parsed:'+r) if obj.Invert : rst = [] - for i in xrange(0,len(shps)): + for i in range(0,len(shps)): if not flags[i]: rst.append(shps[i]) elif obj.FilterType == 'collision-pass': @@ -123,7 +123,7 @@ class _CompoundFilter: rst.append(s) elif obj.FilterType == 'window-volume' or obj.FilterType == 'window-area' or obj.FilterType == 'window-length' or obj.FilterType == 'window-distance': vals = [0.0] * len(shps) - for i in xrange(0,len(shps)): + for i in range(0,len(shps)): if obj.FilterType == 'window-volume': vals[i] = shps[i].Volume elif obj.FilterType == 'window-area': @@ -147,7 +147,7 @@ class _CompoundFilter: valFrom = obj.WindowFrom / 100.0 * maxval valTo = obj.WindowTo / 100.0 * maxval - for i in xrange(0,len(shps)): + for i in range(0,len(shps)): if bool(vals[i] >= valFrom and vals[i] <= valTo) ^ obj.Invert: rst.append(shps[i]) else: diff --git a/lattice2ArrayFilter.py b/lattice2ArrayFilter.py index 67bd748..f27062b 100644 --- a/lattice2ArrayFilter.py +++ b/lattice2ArrayFilter.py @@ -103,7 +103,7 @@ class LatticeArrayFilter(lattice2BaseFeature.LatticeFeature): raise ValueError('index range cannot be parsed:'+r) if obj.Invert : output = [] - for i in xrange(0,len(input)): + for i in range(0,len(input)): if not flags[i]: output.append(input[i]) elif obj.FilterType == 'collision-pass': @@ -115,7 +115,7 @@ class LatticeArrayFilter(lattice2BaseFeature.LatticeFeature): output.append(plm) elif obj.FilterType == 'window-distance': vals = [0.0] * len(input) - for i in xrange(0,len(input)): + for i in range(0,len(input)): if obj.FilterType == 'window-distance': pnt = Part.Vertex(input[i].Base) vals[i] = pnt.distToShape(screen(obj.Stencil).Shape)[0] @@ -123,7 +123,7 @@ class LatticeArrayFilter(lattice2BaseFeature.LatticeFeature): valFrom = obj.WindowFrom valTo = obj.WindowTo - for i in xrange(0,len(input)): + for i in range(0,len(input)): if bool(vals[i] >= valFrom and vals[i] <= valTo) ^ obj.Invert: output.append(input[i]) else: diff --git a/lattice2Subsequencer.py b/lattice2Subsequencer.py index 95f1a06..653237e 100644 --- a/lattice2Subsequencer.py +++ b/lattice2Subsequencer.py @@ -94,9 +94,9 @@ def getIndexesIntoList(element, list_of_shapes): ret = [] - for i_sh in xrange(len(list_of_shapes)): + for i_sh in range(len(list_of_shapes)): elements = element_extractor(list_of_shapes[i_sh]) - for i_el in xrange(len(elements)): + for i_el in range(len(elements)): if elements[i_el].isEqual(element): # to make link more robust, use negative index if one is closer to the end if i_el * 2 > len(elements): @@ -187,7 +187,7 @@ def Subsequence_basic(link, traversal, loop): i_first_child = 0 elements = element_extractors[element_type_string](compound) - index_dict = dict([(HashableShape(elements[i]), i) for i in xrange(len(elements))]) + index_dict = dict([(HashableShape(elements[i]), i) for i in range(len(elements))]) # find the element in each child, find out its global index, and output result in a form of a string for a link ret = [] #list of tuples (object, subelement_string)