X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fexecution%2Fec.py;h=c403d797b0137c3f7d4202dddd2cdc4cd0eff54a;hb=3fe2e6f7812888dc1366915545dd2243ff6fb1bb;hp=d93ef7a7037a99c1695f90b55c07e1729bbfa6ab;hpb=b9237caed1e08ba0ae47c872bebaea7fb393999e;p=nepi.git

diff --git a/src/nepi/execution/ec.py b/src/nepi/execution/ec.py
index d93ef7a7..c403d797 100644
--- a/src/nepi/execution/ec.py
+++ b/src/nepi/execution/ec.py
@@ -16,6 +16,8 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from six import next
+
 from nepi.util import guid
 from nepi.util.parallel import ParallelRun
 from nepi.util.timefuncs import tnow, tdiffsec, stabsformat, tsformat 
@@ -587,6 +589,7 @@ class ExperimentController(object):
             
         """
         # Get next available guid
+        # xxx_next_hiccup
         guid = self._guid_generator.next(guid)
         
         # Instantiate RM
@@ -985,6 +988,7 @@ class ExperimentController(object):
         new_group = False
         if not group:
             new_group = True
+            # xxx_next_hiccup
             group = self._group_id_generator.next()
 
         if group not in self._groups:
@@ -1186,7 +1190,7 @@ class ExperimentController(object):
             try:
                 self._cond.acquire()
 
-                task = self._scheduler.next()
+                task = next(self._scheduler)
                 
                 if not task:
                     # No task to execute. Wait for a new task to be scheduled.