Ensure that subtask argument updating in chain and group respects subtask immutability

peterbrook · ask · commit 2be03e464e2c · 2013-05-09T13:37:03.000+01:00
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):
