Proper return for dunder methdods

kwargs only test

Author: aaltat

atest/librarycomponents.py

@@ -45,6 +45,10 @@ def defaults(self, arg1, arg2='default', arg3=3):
     def varargs_and_kwargs(self, *args, **kws):
         return self.format_args(*args, **kws)
 
+    @keyword
+    def kwargs_only(self, **kws):
+        return self.format_args(**kws)
+
     @keyword
     def all_arguments(self, mandatory, default='value', *varargs, **kwargs):
         return self.format_args(mandatory, default, *varargs, **kwargs)

src/robotlibcore.py

@@ -98,15 +98,15 @@ def run_keyword(self, name, args, kwargs=None):
         return self.keywords[name](*args, **(kwargs or {}))
 
     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(name)
-        return self.__old_arg_spec(name)
-
-    def __new_arg_spec(self, keyword_name):
-        kw = self.__get_keyword(keyword_name)
-        if kw is None:
-            return [tuple(), ]
-        args, defaults, varargs, kwargs = self.__get_arg_spec(kw)
+            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 varargs:
@@ -115,11 +115,8 @@ def __new_arg_spec(self, keyword_name):
             args.append(('**{}'.format(kwargs), ))
         return args
 
-    def __old_arg_spec(self, keyword_name):
-        kw = self.__get_keyword(keyword_name)
-        if kw is None:
-            return []
-        args, defaults, varargs, kwargs = self.__get_arg_spec(kw)
+    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))

utest/test_robotlibcore.py

@@ -16,6 +16,7 @@ def test_keyword_names():
                 'doc_and_tags',
                 'function',
                 'keyword_in_main',
+                'kwargs_only',
                 'mandatory',
                 'method',
                 'multi_line_doc',
@@ -58,6 +59,7 @@ def test_dir():
                 'instance_attribute',
                 'keyword_in_main',
                 'keywords',
+                'kwargs_only',
                 'mandatory',
                 'method',
                 'multi_line_doc',
@@ -104,9 +106,10 @@ def test_get_keyword_arguments_rf31():
     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__') == []
+    assert args('__foobar__') is None
 
 
 @pytest.mark.skipif(robot__version < '3.2', reason='For RF 3.2 or greater')
@@ -117,7 +120,7 @@ def test_get_keyword_arguments_rf32():
     assert args('varargs_and_kwargs') == [('*args', ), ('**kws', )]
     assert args('all_arguments') == [('mandatory', ), ('default', 'value'), ('*varargs', ), ('**kwargs', )]
     assert args('__init__') == [('arg', None)]
-    assert args('__foobar__') == [()]
+    assert args('__foobar__') is None
 
 
 def test_get_keyword_documentation():