Fix bug with RF 4.0 and working with types hints with Union

Author: aaltat

src/robotlibcore.py

@@ -22,7 +22,7 @@
 import os
 import typing
 
-from robot import version as robot_version
+from robot import __version__ as robot_version
 from robot.utils import PY_VERSION
 
 
@@ -262,6 +262,7 @@ def _args_as_list(cls, function, arg_spec):
             function_args.append(arg_spec.varkw)
         return function_args
 
+    # TODO: Remove when support RF 3.2 is dropped
     # Copied from: robot.running.arguments.argumentparser
     @classmethod
     def _remove_optional_none_type_hints(cls, type_hints, defaults):
@@ -276,6 +277,7 @@ def _remove_optional_none_type_hints(cls, type_hints, defaults):
                         type_hints[arg] = types[0]
         return type_hints
 
+    # TODO: Remove when support RF 3.2 is dropped
     # Copied from: robot.running.arguments.argumentparser
     @classmethod
     def _is_union(cls, typing_type):

utest/test_get_keyword_types.py

@@ -1,18 +1,10 @@
-import sys
-from os.path import dirname, abspath, join
-
 import pytest
 import typing
 
 from robotlibcore import RF32
 
 from typing import List, Union
 
-curdir = dirname(abspath(__file__))
-atest_dir = join(curdir, '..', 'atest')
-src = join(curdir, '..', 'src')
-sys.path.insert(0, src)
-sys.path.insert(0, atest_dir)
 from DynamicTypesAnnotationsLibrary import DynamicTypesAnnotationsLibrary
 from DynamicTypesAnnotationsLibrary import CustomObject
 from DynamicTypesLibrary import DynamicTypesLibrary
@@ -194,7 +186,7 @@ def test_keyword_with_decorator_arguments(lib_types):
 
 
 @pytest.mark.skipif(RF32, reason='Only for RF4+')
-def test_keyword_optional_with_none_rf32(lib_types):
+def test_keyword_optional_with_none_rf4(lib_types):
     lib = DynamicTypesAnnotationsLibrary("111")
     types = lib.get_keyword_types('keyword_optional_with_none')
     assert types == {'arg': typing.Union[str, type(None)]}

utest/test_keyword_builder.py

@@ -1,6 +1,7 @@
 import pytest
+import typing
 
-from robotlibcore import KeywordBuilder
+from robotlibcore import KeywordBuilder, RF32
 from moc_library import MockLibrary
 from DynamicTypesAnnotationsLibrary import DynamicTypesAnnotationsLibrary
 
@@ -77,11 +78,18 @@ def test_types(lib):
     assert spec.argument_types == {'varargs': int, 'other': bool, 'kwargs': int}
 
 
-def test_optional_none(lib):
+@pytest.mark.skipif(not RF32, reason='Only for RF3.2+')
+def test_optional_none_rf32(lib):
     spec = KeywordBuilder.build(lib.optional_none)
     assert spec.argument_types == {'arg1': str, 'arg2': str}
 
 
+@pytest.mark.skipif(RF32, reason='Only for RF4')
+def test_optional_none_rf4(lib):
+    spec = KeywordBuilder.build(lib.optional_none)
+    assert spec.argument_types == {'arg1': typing.Union[str, None], 'arg2': typing.Union[str, None]}
+
+
 def test_complex_deco(dyn_types):
     spec = KeywordBuilder.build(dyn_types.keyword_with_deco_and_signature)
     assert spec.argument_types == {'arg1': bool, 'arg2': bool}