Skip to content

Commit 8e5edd0

Browse files
committed
.next() is no more a method for list iterators in py3. Use the next() builtin function instaed
1 parent 52b347d commit 8e5edd0

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

OCCUtils/Iteration.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def __init__(self, wire):
3939
def next(self):
4040
if self.index == 0:
4141
# first edge, need to set self.previous_edge
42-
self.previous_edge = self.we.next()
43-
self.current_edge = self.we.next()
42+
self.previous_edge = next(self.we)
43+
self.current_edge = next(self.we)
4444
self.first_edge = self.previous_edge # for the last iteration
4545
self.index += 1
4646
return [self.previous_edge, self.current_edge]
@@ -50,7 +50,7 @@ def next(self):
5050
return [self.current_edge, self.first_edge]
5151
else:
5252
self.previous_edge = self.current_edge
53-
self.current_edge = self.we.next()
53+
self.current_edge = next(self.we)
5454
self.index += 1
5555
return [self.previous_edge, self.current_edge]
5656

@@ -95,8 +95,8 @@ def next(self):
9595
closest = self.closest_point(vert)
9696
edges_a = self.tp_A.edges_from_vertex(vert)
9797
edges_b = self.tp_B.edges_from_vertex(closest)
98-
a1, a2 = Edge(edges_a.next()), Edge(edges_a.next())
99-
b1, b2 = Edge(edges_b.next()), Edge(edges_b.next())
98+
a1, a2 = Edge(next(edges_a)), Edge(next(edges_a))
99+
b1, b2 = Edge(next(edges_b)), Edge(next(edges_b))
100100
mpA = a1.mid_point()
101101
self.index += 1
102102

OCCUtils/edge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def intersect(self, other, disp, tolerance=1e-2):
5252
face_curve_intersect.Init(other, self.instance.adaptor.Curve(), tolerance)
5353
pnts = []
5454
while face_curve_intersect.More():
55-
face_curve_intersect.Next()
55+
next(face_curve_intersect)
5656
pnts.append(face_curve_intersect.Pnt())
5757
return pnts
5858

@@ -560,6 +560,6 @@ def color(self, *rgb):
560560
from Topology import Topo
561561
b = BRepPrimAPI_MakeBox(10, 20, 30).Shape()
562562
t = Topo(b)
563-
ed = t.edges().next()
563+
ed = next(t.edges())
564564
my_e = Edge(ed)
565565
print(my_e.tolerance)

OCCUtils/face.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ def iso_curve(self, u_or_v, param):
451451
return iso
452452

453453
def Edges(self):
454-
return [Edge(i) for i in WireExplorer(self.topo.wires().next()).ordered_edges()]
454+
return [Edge(i) for i in WireExplorer(next(self.topo.wires())).ordered_edges()]
455455

456456
def __repr__(self):
457457
return self.name

0 commit comments

Comments
 (0)