More Py2.6 specific changes

celery/app/base.py

@@ -248,7 +248,7 @@ class Celery(object):
         def _inner(*args, **kwargs):
             connection = kwargs.pop('connection', None)
             with self.default_connection(connection) as c:
-                return fun(*args, **dict(kwargs, connection=c))
+                return fun(*args, connection=c, **kwargs)
         return _inner
 
     def prepare_config(self, c):

celery/bin/celery.py

@@ -644,7 +644,7 @@ class status(Command):
                           no_color=kwargs.get('no_color', False),
                           stdout=self.stdout, stderr=self.stderr,
                           show_reply=False) \
-                    .run('ping', **dict(kwargs, quiet=True, show_body=False))
+                    .run('ping', quiet=True, show_body=False, **kwargs)
         if not replies:
             raise Error('No nodes replied within time constraint',
                         status=EX_UNAVAILABLE)

celery/tests/app/test_routes.py

@@ -12,7 +12,7 @@ from celery.tests.utils import Case
 
 
 def Router(*args, **kwargs):
-    return routes.Router(*args, **dict(kwargs, app=current_app))
+    return routes.Router(*args, app=current_app, **kwargs)
 
 
 @task()