order param list according to function signature (via #270)

Author: Sup3rGeo

allure-python-commons/src/utils.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+import sys
 import six
 import time
 import uuid
@@ -10,6 +11,8 @@
 import platform
 import threading
 import traceback
+import collections
+
 
 if six.PY3:
     from traceback import format_exception_only
@@ -122,7 +125,7 @@ def func_parameters(func, *args, **kwargs):
     >>> def helper(func):
     ...     def wrapper(*args, **kwargs):
     ...         params = func_parameters(func, *args, **kwargs)
-    ...         print(sorted(params.items()))
+    ...         print(list(params.items()))
     ...         return func(*args, **kwargs)
     ...     return wrapper
 
@@ -215,14 +218,12 @@ def func_parameters(func, *args, **kwargs):
     ... def args_kwargs_varargs_keywords(a, b=2, *c, **d):
     ...     pass
 
-
     >>> args_kwargs_varargs_keywords(1)
     [('a', '1'), ('b', '2')]
 
     >>> args_kwargs_varargs_keywords(1, 2, 4, d=5, e=6)
     [('a', '1'), ('b', '2'), ('c', '(4,)'), ('d', '5'), ('e', '6')]
 
-
     >>> class Class(object):
     ...     @staticmethod
     ...     @helper
@@ -252,24 +253,37 @@ def func_parameters(func, *args, **kwargs):
     """
     parameters = {}
     arg_spec = inspect.getargspec(func) if six.PY2 else inspect.getfullargspec(func)
+    arg_order = list(arg_spec.args)
     args_dict = dict(zip(arg_spec.args, args))
 
     if arg_spec.defaults:
         kwargs_defaults_dict = dict(zip(arg_spec.args[len(args):], arg_spec.defaults))
         parameters.update(kwargs_defaults_dict)
 
     if arg_spec.varargs:
+        arg_order.append(arg_spec.varargs)
         varargs = args[len(arg_spec.args):]
         parameters.update({arg_spec.varargs: varargs} if varargs else {})
 
     if arg_spec.args and arg_spec.args[0] in ['cls', 'self']:
         args_dict.pop(arg_spec.args[0], None)
 
-    parameters.update(kwargs)
+    if kwargs:
+        if sys.version_info < (3, 6):
+            # Sort alphabetically as old python versions does
+            # not preserve call order for kwargs
+            arg_order.extend(sorted(list(kwargs.keys())))
+        else:
+            # Keep py3.6 behaviour to preserve kwargs order
+            arg_order.extend(list(kwargs.keys()))
+        parameters.update(kwargs)
+
     parameters.update(args_dict)
 
     items = parameters.iteritems() if six.PY2 else parameters.items()
-    return dict(map(lambda kv: (kv[0], represent(kv[1])), items))
+    sorted_items = sorted(map(lambda kv: (kv[0], represent(kv[1])), items), key=lambda x: arg_order.index(x[0]))
+
+    return collections.OrderedDict(sorted_items)
 
 
 def format_traceback(exc_traceback):