added RF7 compatibility (Return Types)

Signed-off-by: René <[email protected]>

atest/DynamicTypesAnnotationsLibrary.py

@@ -56,7 +56,7 @@ def keyword_new_type(self, arg: UserId):
         return arg
 
     @keyword
-    def keyword_define_return_type(self, arg: str) -> None:
+    def keyword_define_return_type(self, arg: str) -> Union[List[str], str]:
         logger.info(arg)
         return None
 

src/robotlibcore.py

@@ -291,8 +291,8 @@ def _get_typing_hints(cls, function):
         arg_spec = cls._get_arg_spec(function)
         all_args = cls._args_as_list(function, arg_spec)
         for arg_with_hint in list(hints):
-            # remove return and self statements
-            if arg_with_hint not in all_args:
+            # remove self statements
+            if arg_with_hint not in [*all_args, "return"]:
                 hints.pop(arg_with_hint)
         return hints
 

utest/test_get_keyword_types.py

@@ -80,7 +80,7 @@ def test_keyword_new_type(lib_types):
 
 def test_keyword_return_type(lib_types):
     types = lib_types.get_keyword_types("keyword_define_return_type")
-    assert types == {"arg": str}
+    assert types == {"arg": str, 'return': Union[List[str], str]}
 
 
 def test_keyword_forward_references(lib_types):
@@ -105,7 +105,7 @@ def test_keyword_with_annotation_external_class(lib_types):
 
 def test_keyword_with_annotation_and_default_part2(lib_types):
     types = lib_types.get_keyword_types("keyword_default_and_annotation")
-    assert types == {"arg1": int, "arg2": Union[bool, str]}
+    assert types == {"arg1": int, "arg2": Union[bool, str], 'return': str}
 
 
 def test_keyword_with_robot_types_and_annotations(lib_types):
@@ -125,7 +125,7 @@ def test_keyword_with_robot_types_and_bool_annotations(lib_types):
 
 def test_init_args(lib_types):
     types = lib_types.get_keyword_types("__init__")
-    assert types == {"arg": str}
+    assert types == {"arg": str, "return": type(None)}
 
 
 def test_dummy_magic_method(lib):
@@ -140,7 +140,7 @@ def test_varargs(lib):
 
 def test_init_args_with_annotation(lib_types):
     types = lib_types.get_keyword_types("__init__")
-    assert types == {"arg": str}
+    assert types == {"arg": str, "return": type(None)}
 
 
 def test_exception_in_annotations(lib_types):

utest/test_keyword_builder.py

@@ -70,7 +70,7 @@ def test_types_disabled_in_keyword_deco(lib):
 
 def test_types_(lib):
     spec = KeywordBuilder.build(lib.args_with_type_hints)
-    assert spec.argument_types == {"arg3": str, "arg4": type(None)}
+    assert spec.argument_types == {"arg3": str, "arg4": type(None), "return": bool}
 
 
 def test_types(lib):