Cosmetics for #2148

celery/app/amqp.py

@@ -269,8 +269,8 @@ class AMQP(object):
                    expires=None, retries=0, chord=None,
                    callbacks=None, errbacks=None, reply_to=None,
                    time_limit=None, soft_time_limit=None,
-                   create_sent_event=False, now=None, timezone=None,
-                   root_id=None, parent_id=None):
+                   create_sent_event=False, root_id=None, parent_id=None,
+                   now=None, timezone=None):
         args = args or ()
         kwargs = kwargs or {}
         utc = self.utc
@@ -336,8 +336,8 @@ class AMQP(object):
                    expires=None, retries=0,
                    chord=None, callbacks=None, errbacks=None, reply_to=None,
                    time_limit=None, soft_time_limit=None,
-                   create_sent_event=False, now=None, timezone=None,
-                   root_id=None, parent_id=None):
+                   create_sent_event=False, root_id=None, parent_id=None,
+                   now=None, timezone=None):
         args = args or ()
         kwargs = kwargs or {}
         utc = self.utc

celery/app/base.py

@@ -373,8 +373,7 @@ class Celery(object):
             expires, retries, chord,
             maybe_list(link), maybe_list(link_error),
             reply_to or self.oid, time_limit, soft_time_limit,
-            self.conf.CELERY_SEND_TASK_SENT_EVENT, None, None,
-            root_id, parent_id,
+            self.conf.CELERY_SEND_TASK_SENT_EVENT, root_id, parent_id,
         )
 
         if connection: