CMFActivity: cleanup CMFActivityParallelBackend.py

product/CMFActivity/joblib/CMFActivityParallelBackend.py

@@ -46,12 +46,12 @@ else:
     """Wrapper around a SafeFunction that catches any exception
        The exception can be handled in CMFActivityResult.get
     """
-    def __init__(self, *args, **kwargs):
-      super(JoblibSafeFunction, self).__init__(*args, **kwargs)
+    def __init__(self, *args, **kw):
+      super(JoblibSafeFunction, self).__init__(*args, **kw)
 
-    def __call__(self, *args, **kwargs):
+    def __call__(self, *args, **kw):
       try:
-        return super(JoblibSafeFunction, self).__call__(*args, **kwargs)
+        return super(JoblibSafeFunction, self).__call__(*args, **kw)
       except Exception as exc:
         raise exc
 
@@ -75,9 +75,10 @@ else:
       return result
 
   class CMFActivityBackend(ParallelBackendBase):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kw):
       self.count = 1
-      self.active_process = kwargs['active_process']
+      self.active_process = kw['active_process']
+      #self.portal = kw['portal']
 
     def effective_n_jobs(self, n_jobs):
       """Dummy implementation to prevent n_jobs <=0
@@ -90,19 +91,17 @@ else:
 
     def apply_async(self, batch, callback=None):
       """Schedule a func to be run"""
-      portal_activities = self.active_process.portal_activities
       active_process_id = self.active_process.getId()
-      joblib_result = None
+      portal_activities = self.active_process.portal_activities
+      # active_process = portal_activities.getActiveProcess()
       # create a signature and convert it to integer
       sig = sqljoblib_hash((JoblibSafeFunction(batch),))
       resultDict = self.active_process.getResultDict()
       if not resultDict.has_key(sig):
-        joblib_result = portal_activities.activate(activity='SQLJoblib',
-          tag="joblib_%s" % active_process_id,
+        portal_activities.activate(activity='SQLJoblib',
+          tag="joblib_" + active_process_id,
           active_process=self.active_process)._callSafeFunction(JoblibSafeFunction(batch))
-      if joblib_result is None:
-        joblib_result = CMFActivityResult(self.active_process, sig, callback)
-      return joblib_result
+      return CMFActivityResult(self.active_process, sig, callback)
 
     def configure(self, n_jobs=1, parallel=None, **backend_args):
       """Reconfigure the backend and return the number of workers. This