Removed code duplication

Author: aaltat

src/robotlibcore.py

@@ -101,28 +101,22 @@ def get_keyword_arguments(self, name):
         kw_method = self.__get_keyword(name)
         if kw_method is None:
             return None
-        if robot_version >= '3.2':
-            return self.__new_arg_spec(kw_method)
-        return self.__old_arg_spec(kw_method)
-
-    def __new_arg_spec(self, kw_method):
         args, defaults, varargs, kwargs = self.__get_arg_spec(kw_method)
-        args = [(arg, ) for arg in args]
-        args += [(name, value) for name, value in defaults]
+        if robot_version >= '3.2':
+            args += self.__new_default_spec(defaults)
+        else:
+            args += self.__old_default_spec(defaults)
         if varargs:
-            args.append(('*{}'.format(varargs), ))
+            args.append('*%s' % varargs)
         if kwargs:
-            args.append(('**{}'.format(kwargs), ))
+            args.append('**%s' % kwargs)
         return args
 
-    def __old_arg_spec(self, kw_method):
-        args, defaults, varargs, kwargs = self.__get_arg_spec(kw_method)
-        args += ['{}={}'.format(name, value) for name, value in defaults]
-        if varargs:
-            args.append('*{}'.format(varargs))
-        if kwargs:
-            args.append('**{}'.format(kwargs))
-        return args
+    def __new_default_spec(self, defaults):
+        return [(name, value) for name, value in defaults]
+
+    def __old_default_spec(self, defaults):
+        return ['{}={}'.format(name, value) for name, value in defaults]
 
     def __get_arg_spec(self, kw):
         if PY2:

utest/test_robotlibcore.py

@@ -37,8 +37,8 @@ def test_dir():
                 '_DynamicCore__get_keyword_tags_supported',
                 '_DynamicCore__get_typing_hints',
                 '_DynamicCore__join_defaults_with_types',
-                '_DynamicCore__new_arg_spec',
-                '_DynamicCore__old_arg_spec',
+                '_DynamicCore__new_default_spec',
+                '_DynamicCore__old_default_spec',
                 '_HybridCore__get_members',
                 '_HybridCore__get_members_from_instance',
                 '_custom_name',
@@ -76,8 +76,8 @@ def test_dir():
                                                  '_DynamicCore__get_keyword_path',
                                                  '_DynamicCore__get_keyword_tags_supported',
                                                  '_DynamicCore__join_defaults_with_types',
-                                                 '_DynamicCore__new_arg_spec',
-                                                 '_DynamicCore__old_arg_spec',
+                                                 '_DynamicCore__new_default_spec',
+                                                 '_DynamicCore__old_default_spec',
                                                  'get_keyword_arguments',
                                                  'get_keyword_documentation',
                                                  'get_keyword_source',
@@ -115,10 +115,11 @@ def test_get_keyword_arguments_rf31():
 @pytest.mark.skipif(robot__version < '3.2', reason='For RF 3.2 or greater')
 def test_get_keyword_arguments_rf32():
     args = DynamicLibrary().get_keyword_arguments
-    assert args('mandatory') == [('arg1', ), ('arg2', )]
-    assert args('defaults') == [('arg1', ), ('arg2', 'default'), ('arg3', 3)]
-    assert args('varargs_and_kwargs') == [('*args', ), ('**kws', )]
-    assert args('all_arguments') == [('mandatory', ), ('default', 'value'), ('*varargs', ), ('**kwargs', )]
+    assert args('mandatory') == ['arg1', 'arg2']
+    assert args('defaults') == ['arg1', ('arg2', 'default'), ('arg3', 3)]
+    assert args('varargs_and_kwargs') == ['*args', '**kws']
+    assert args('kwargs_only') == ['**kws']
+    assert args('all_arguments') == ['mandatory', ('default', 'value'), '*varargs', '**kwargs']
     assert args('__init__') == [('arg', None)]
     assert args('__foobar__') is None