fix #3678 (#3693)

celery/utils/functional.py

@@ -252,10 +252,10 @@ def _argsfromspec(spec, replace_defaults=True):
         ', '.join(positional),
         ', '.join('{0}={1}'.format(k, v) for k, v in optional),
         '*{0}'.format(varargs) if varargs else None,
-        '**{0}'.format(varkw) if varkw else None,
         '*' if (kwonlyargs or kwonlyargs_optional) and not varargs else None,
         ', '.join(kwonlyargs) if kwonlyargs else None,
         ', '.join('{0}="{1}"'.format(k, v) for k, v in kwonlyargs_optional),
+        '**{0}'.format(varkw) if varkw else None,
     ]))
 
 

t/unit/utils/test_functional.py

@@ -165,7 +165,7 @@ class test_head_from_fun:
     @skip.unless_python3()
     def test_regression_3678(self):
         local = {}
-        fun = ('def f(foo, *args, bar=""):'
+        fun = ('def f(foo, *args, bar="", **kwargs):'
                '    return foo, args, bar')
         exec(fun, {}, local)