Merge branch 'master' into synack

ask · ask · commit 8ff7177a4382 · 2013-05-14T11:08:57.000+01:00
diff --git a/celery/backends/mongodb.py b/celery/backends/mongodb.py
@@ -128,7 +128,7 @@ def _store_result(self, task_id, result, status, traceback=None):
                 'date_done': datetime.utcnow(),
                 'traceback': Binary(self.encode(traceback)),
                 'children': Binary(self.encode(self.current_task_children()))}
-        self.collection.save(meta, safe=True)
+        self.collection.save(meta)
 
         return result
 
@@ -155,7 +155,7 @@ def _save_group(self, group_id, result):
         meta = {'_id': group_id,
                 'result': Binary(self.encode(result)),
                 'date_done': datetime.utcnow()}
-        self.collection.save(meta, safe=True)
+        self.collection.save(meta)
 
         return result
 
@@ -187,7 +187,7 @@ def _forget(self, task_id):
         # By using safe=True, this will wait until it receives a response from
         # the server.  Likewise, it will raise an OperationsError if the
         # response was unable to be completed.
-        self.collection.remove({'_id': task_id}, safe=True)
+        self.collection.remove({'_id': task_id})
 
     def cleanup(self):
         """Delete expired metadata."""
diff --git a/celery/canvas.py b/celery/canvas.py
@@ -298,7 +298,7 @@ def from_dict(self, d):
         tasks = d['kwargs']['tasks']
         if d['args'] and tasks:
             # partial args passed on to first task in chain (Issue #1057).
-            tasks[0]['args'] = d['args'] + tasks[0]['args']
+            tasks[0]['args'] = tasks[0]._merge(d['args'])[0]
         return chain(*d['kwargs']['tasks'], **kwdict(d['options']))
 
     @property
@@ -409,7 +409,7 @@ def from_dict(self, d):
         if d['args'] and tasks:
             # partial args passed on to all tasks in the group (Issue #1057).
             for task in tasks:
-                task['args'] = d['args'] + task['args']
+                task['args'] = task._merge(d['args'])[0]
         return group(tasks, **kwdict(d['options']))
 
     def __call__(self, *partial_args, **options):
