Fixed get_keyword_types if seld has typing hints

Author: aaltat

atest/DynamicTypesAnnotationsLibrary.py

@@ -43,23 +43,23 @@ def keyword_define_return_type(self, arg: str) -> None:
         return None
 
     @keyword
-    def keyword_forward_references(self, arg: 'CustomObject'):
+    def keyword_forward_references(self: 'DynamicTypesAnnotationsLibrary', arg: 'CustomObject'):
         return arg
 
     @keyword
-    def keyword_with_annotations_and_default(self, arg: str = 'Foobar'):
+    def keyword_with_annotations_and_default(self: 'DynamicTypesAnnotationsLibrary', arg: str = 'Foobar'):
         return arg
 
     @keyword
     def keyword_with_webdriver(self, arg: CustomObject):
         return arg
 
     @keyword
-    def keyword_default_and_annotation(self, arg1: int, arg2=False) -> str:
+    def keyword_default_and_annotation(self: 'DynamicTypesAnnotationsLibrary', arg1: int, arg2=False) -> str:
         return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
 
     @keyword(types={'arg': str})
-    def keyword_robot_types_and_annotations(self, arg: int):
+    def keyword_robot_types_and_annotations(self: 'DynamicTypesAnnotationsLibrary', arg: int):
         return '%s: %s' % (arg, type(arg))
 
     @keyword(types=None)
@@ -71,7 +71,7 @@ def keyword_robot_types_and_bool_defaults(self, arg1, arg2=False):
         return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
 
     @keyword
-    def keyword_exception_annotations(self, arg: 'NotHere'):
+    def keyword_exception_annotations(self: 'DynamicTypesAnnotationsLibrary', arg: 'NotHere'):
         return arg
 
     @keyword
@@ -87,7 +87,7 @@ def keyword_only_arguments_no_vararg(self, *, other):
         return f'{other}: {type(other)}'
 
     @keyword
-    def keyword_only_arguments_many_positional_and_default(self, *varargs, one, two, three, four=True, five=None, six=False):
+    def keyword_only_arguments_many_positional_and_default(self: 'DynamicTypesAnnotationsLibrary', *varargs, one, two, three, four=True, five=None, six=False):
         return f'{varargs}, {one}, {two}, {three}, {four}, {five}, {six}'
 
     @keyword
@@ -103,5 +103,13 @@ def keyword_mandatory_and_keyword_only_arguments(self, arg: int, *vararg, some=T
         return f'{arg}, {vararg}, {some}'
 
     @keyword
-    def keyword_all_args(self, mandatory, positional=1, *varargs, other, value=False, **kwargs):
+    def keyword_all_args(self: 'DynamicTypesAnnotationsLibrary', mandatory, positional=1, *varargs, other, value=False, **kwargs):
+        return True
+
+    @keyword
+    def keyword_self_and_types(self: 'DynamicTypesAnnotationsLibrary', mandatory: str, *varargs, other: bool, **kwargs):
+        return True
+
+    @keyword
+    def keyword_self_and_keyword_only_types(self: 'DynamicTypesAnnotationsLibrary', mandatory, *varargs, other: bool, **kwargs):
         return True

src/robotlibcore.py

@@ -145,6 +145,11 @@ def __get_typing_hints(self, method):
         except Exception:
             hints = method.__annotations__
         hints.pop('return', None)
+        spec = ArgumentSpec.from_function(method)
+        for arg in hints.copy():
+            # Drop self
+            if arg not in spec.positional and arg not in spec.kwonlyargs:
+                hints.pop(arg)
         return hints
 
     def __join_defaults_with_types(self, method, types):

utest/test_get_keyword_types.py

@@ -193,3 +193,20 @@ def test_keyword_only_arguments_many(lib_types):
 def test_keyword_only_arguments_many(lib_types):
     types = lib_types.get_keyword_types('keyword_only_arguments_many_positional_and_default')
     assert types == {'four': bool, 'five': type(None), 'six': bool}
+
+
+@pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
+def test_keyword_all_args(lib_types):
+    types = lib_types.get_keyword_types('keyword_all_args')
+    assert types == {'value': bool}
+
+
+@pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
+def test_keyword_self_and_types(lib_types):
+    types = lib_types.get_keyword_types('keyword_self_and_types')
+    assert types == {'mandatory': str, 'other': bool}
+
+@pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
+def test_keyword_self_and_keyword_only_types(lib_types):
+    types = lib_types.get_keyword_types('keyword_self_and_keyword_only_types')
+    assert types == {'other': bool}