Finish task iterator (first version)

Author: kinow

decyclify/node_iterators.py

@@ -125,7 +125,7 @@ def _next_nodes(self):
 
     def _remove_nodes(self, nodes):
         for (key, intraiteration_node) in enumerate(self.intraiteration_nodes):
-            for node in intraiteration_node:
+            for node in intraiteration_node.copy():
                 if node in nodes:
                     intraiteration_node.remove(node)
                     self.current_nodes.remove(node)
@@ -170,7 +170,7 @@ def _pop_next_interiteration(self, new_nodes_in_this_cycle):
                         # returned, so we are good to return this downstream dependency
                         if interiteration_trigger_node not in self.previous.current_nodes:
                             nodes.append(next_intraiteration_node)
-                            self._remove_nodes([next_intraiteration_node])
+                            self._remove_nodes([node])
         return nodes
 
 
@@ -221,7 +221,7 @@ def __next__(self):
 
         # collect tasks/nodes ready to execute in each cycle
         new_nodes_in_this_cycle = []
-        for cycle in self.cycles:
+        for cycle in self.cycles.copy():
             try:
                 new_nodes_in_this_cycle.extend(cycle.iterate(new_nodes_in_this_cycle))
             except RemoveCycle:

tests/test_node_iterators.py

@@ -63,7 +63,7 @@ def test_tasks_iterator(sample_graph):
 
     iterator = TasksIterator(graph, cycles_removed, cycles=2)
 
-    expected = [['a.0'], ['b.0', 'e.0', 'a.1'], ['c.0', 'b.1'], ['d.0', 'c.1'], ['d.1']]
+    expected = [['a.0'], ['b.0', 'e.0', 'a.1'], ['c.0', 'b.1', 'e.1'], ['d.0', 'c.1'], ['d.1']]
     iterated = []
 
     for index, node in enumerate(iterator):