Merge branch '3.0'

Conflicts:
	celery/result.py
	celery/tests/tasks/test_chord.py

celery/app/builtins.py

@@ -175,11 +175,11 @@ def add_group_task(app):
             if self.request.is_eager or app.conf.CELERY_ALWAYS_EAGER:
                 return app.GroupResult(
                     result.id,
-                    [task.apply(group_id=group_id) for task in taskit],
+                    [stask.apply(group_id=group_id) for stask in taskit],
                 )
             with app.producer_or_acquire() as pub:
-                [task.apply_async(group_id=group_id, publisher=pub,
-                                  add_to_parent=False) for task in taskit]
+                [stask.apply_async(group_id=group_id, publisher=pub,
+                                   add_to_parent=False) for stask in taskit]
             parent = get_current_worker_task()
             if parent:
                 parent.request.children.append(result)

celery/tests/backends/test_base.py

@@ -135,7 +135,7 @@ class KVBackend(KeyValueStoreBackend):
         if self.mget_returns_dict:
             return dict((key, self.get(key)) for key in keys)
         else:
-            return [self.get(key) for key in keys]
+            return [self.get(k) for k in keys]
 
     def delete(self, key):
         self.db.pop(key, None)

celery/tests/tasks/test_chord.py

@@ -157,7 +157,7 @@ class test_Chord_task(AppCase):
 
             body = dict()
             Chord(TaskSet(add.subtask((i, i)) for i in range(5)), body)
-            Chord([add.subtask((i, i)) for i in range(5)], body)
+            Chord([add.subtask((j, j)) for j in range(5)], body)
             self.assertEqual(current_app.backend.on_chord_apply.call_count, 2)
         finally:
             current_app.backend = prev