Lint fixes

Author: aaltat

pyproject.toml

@@ -46,6 +46,14 @@ lint.select = [
     "RUF"
 ]
 
+[tool.ruff.lint.extend-per-file-ignores]
+"utest/*" = [
+    "S",
+    "SLF",
+    "PLR",
+    "B018"
+]
+
 [tool.ruff.lint.mccabe]
 max-complexity = 9
 

tasks.py

@@ -132,9 +132,10 @@ def lint(ctx):
         ruff_cmd.append("--fix")
     ruff_cmd.append("./src")
     ruff_cmd.append("./tasks.py")
+    ruff_cmd.append("./utest")
     ctx.run(" ".join(ruff_cmd))
     print("Run black")
-    ctx.run("black src/ tasks.py utest/run.py atest/run.py")
+    ctx.run("black src/ tasks.py utest atest/run.py")
     print("Run tidy")
     print(f"Lint Robot files {'in ci' if in_ci else ''}")
     command = [

utest/run.py

@@ -2,23 +2,19 @@
 import argparse
 import platform
 import sys
-from os.path import abspath, dirname, join
+from pathlib import Path
 
 import pytest
 from robot.version import VERSION as RF_VERSION
 
-curdir = dirname(abspath(__file__))
-atest_dir = join(curdir, "..", "atest")
+curdir = Path(__file__).parent
+atest_dir = curdir / ".." / "atest"
 python_version = platform.python_version()
-xunit_report = join(
-    atest_dir,
-    "results",
-    "xunit-python-{}-robot{}.xml".format(python_version, RF_VERSION),
-)
-src = join(curdir, "..", "src")
+xunit_report = atest_dir / "results" / f"xunit-python-{python_version}-robot{RF_VERSION}.xml"
+src = curdir / ".." / "src"
 sys.path.insert(0, src)
 sys.path.insert(0, atest_dir)
-helpers = join(curdir, "helpers")
+helpers = curdir / "helpers"
 sys.path.append(helpers)
 
 parser = argparse.ArgumentParser()

utest/test_get_keyword_source.py

@@ -1,5 +1,5 @@
 import inspect
-from os import path
+from pathlib import Path
 
 import pytest
 from DynamicLibrary import DynamicLibrary
@@ -18,23 +18,26 @@ def lib_types():
 
 
 @pytest.fixture(scope="module")
-def cur_dir():
-    return path.dirname(__file__)
+def cur_dir() -> Path:
+    return Path(__file__).parent
 
 
 @pytest.fixture(scope="module")
-def lib_path(cur_dir):
-    return path.normpath(path.join(cur_dir, "..", "atest", "DynamicLibrary.py"))
+def lib_path(cur_dir) -> Path:
+    path = cur_dir / ".." / "atest" / "DynamicLibrary.py"
+    return path.resolve()
 
 
 @pytest.fixture(scope="module")
-def lib_path_components(cur_dir):
-    return path.normpath(path.join(cur_dir, "..", "atest", "librarycomponents.py"))
+def lib_path_components(cur_dir) -> Path:
+    path = cur_dir / ".." / "atest" / "librarycomponents.py"
+    return path.resolve()
 
 
 @pytest.fixture(scope="module")
-def lib_path_types(cur_dir):
-    return path.normpath(path.join(cur_dir, "..", "atest", "DynamicTypesLibrary.py"))
+def lib_path_types(cur_dir) -> Path:
+    path = cur_dir / ".." / "atest" / "DynamicTypesLibrary.py"
+    return path.resolve()
 
 
 def test_location_in_main(lib, lib_path):
@@ -60,7 +63,7 @@ def test_location_in_class_custom_keyword_name(lib, lib_path_components):
 def test_no_line_number(lib, lib_path, when):
     when(lib)._DynamicCore__get_keyword_line(Any()).thenReturn(None)
     source = lib.get_keyword_source("keyword_in_main")
-    assert source == lib_path
+    assert Path(source) == lib_path
 
 
 def test_no_path(lib, when):
@@ -90,4 +93,4 @@ def test_error_in_getfile(lib, when):
 def test_error_in_line_number(lib, when, lib_path):
     when(inspect).getsourcelines(Any()).thenRaise(IOError("Some message"))
     source = lib.get_keyword_source("keyword_in_main")
-    assert source == lib_path
+    assert Path(source) == lib_path

utest/test_get_keyword_types.py

@@ -4,7 +4,7 @@
 import pytest
 from DynamicTypesAnnotationsLibrary import CustomObject, DynamicTypesAnnotationsLibrary
 from DynamicTypesLibrary import DynamicTypesLibrary
-from lib_future_annotation import lib_future_annotation, Location
+from lib_future_annotation import Location, lib_future_annotation
 
 
 @pytest.fixture(scope="module")
@@ -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, 'return': Union[List[str], 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], 'return': str}
+    assert types == {"arg1": int, "arg2": Union[bool, str], "return": str}
 
 
 def test_keyword_with_robot_types_and_annotations(lib_types):
@@ -205,7 +205,7 @@ def test_kw_with_named_arguments(lib_types: DynamicTypesAnnotationsLibrary):
 
 def test_kw_with_many_named_arguments_with_default(lib_types: DynamicTypesAnnotationsLibrary):
     types = lib_types.get_keyword_types("kw_with_many_named_arguments_with_default")
-    assert types == {'arg2': int}
+    assert types == {"arg2": int}
     types = lib_types.get_keyword_types("kw_with_positional_and_named_arguments_with_defaults")
     assert types == {"arg1": int, "arg2": str}
     types = lib_types.get_keyword_types("kw_with_positional_and_named_arguments")

utest/test_plugin_api.py

@@ -1,5 +1,5 @@
-from helpers import my_plugin_test
 import pytest
+from helpers import my_plugin_test
 from robotlibcore import Module, PluginError, PluginParser
 
 
@@ -19,17 +19,17 @@ def test_plugins_string_to_modules(plugin_parser):
     result = plugin_parser._string_to_modules("path.to.MyLibrary,path.to.OtherLibrary")
     assert result == [
         Module("path.to.MyLibrary", [], {}),
-        Module("path.to.OtherLibrary", [], {})
+        Module("path.to.OtherLibrary", [], {}),
     ]
     result = plugin_parser._string_to_modules("path.to.MyLibrary , path.to.OtherLibrary")
     assert result == [
         Module("path.to.MyLibrary", [], {}),
-        Module("path.to.OtherLibrary", [], {})
+        Module("path.to.OtherLibrary", [], {}),
     ]
     result = plugin_parser._string_to_modules("path.to.MyLibrary;foo;bar , path.to.OtherLibrary;1")
     assert result == [
         Module("path.to.MyLibrary", ["foo", "bar"], {}),
-        Module("path.to.OtherLibrary", ["1"], {})
+        Module("path.to.OtherLibrary", ["1"], {}),
     ]
     result = plugin_parser._string_to_modules("PluginWithKwArgs.py;kw1=Text1;kw2=Text2")
     assert result == [
@@ -52,7 +52,7 @@ def test_parse_plugins_as_list(plugin_parser):
     assert len(plugins) == 1
     assert isinstance(plugins[0], my_plugin_test.TestClass)
     plugins = plugin_parser.parse_plugins(
-        ["helpers.my_plugin_test.TestClass", "helpers.my_plugin_test.TestClassWithBase"]
+        ["helpers.my_plugin_test.TestClass", "helpers.my_plugin_test.TestClassWithBase"],
     )
     assert len(plugins) == 2
     assert isinstance(plugins[0], my_plugin_test.TestClass)
@@ -81,11 +81,11 @@ def test_plugin_python_objects():
     class PythonObject:
         x = 1
         y = 2
+
     python_object = PythonObject()
     parser = PluginParser(my_plugin_test.LibraryBase, [python_object])
     plugins = parser.parse_plugins("helpers.my_plugin_test.TestPluginWithPythonArgs;4")
     assert len(plugins) == 1
     plugin = plugins[0]
     assert plugin.python_class.x == 1
     assert plugin.python_class.y == 2
-

utest/test_robotlibcore.py

@@ -1,10 +1,11 @@
 import json
+
 import pytest
+from approvaltests.approvals import verify
 from DynamicLibrary import DynamicLibrary
 from DynamicTypesAnnotationsLibrary import DynamicTypesAnnotationsLibrary
 from HybridLibrary import HybridLibrary
 from robotlibcore import HybridCore, NoKeywordFound
-from approvaltests.approvals import verify, verify_all
 
 
 @pytest.fixture(scope="module")
@@ -17,15 +18,17 @@ def test_keyword_names_hybrid():
 
 
 def test_keyword_names_dynamic():
-     verify(json.dumps(DynamicLibrary().get_keyword_names(), indent=4)) 
+    verify(json.dumps(DynamicLibrary().get_keyword_names(), indent=4))
+
 
 def test_dir_dyn_lib():
     result = [a for a in dir(DynamicLibrary()) if a[:2] != "__"]
     result = json.dumps(result, indent=4)
     verify(result)
 
+
 def test_dir_hubrid_lib():
-    result =  [a for a in dir(HybridLibrary()) if a[:2] != "__"]
+    result = [a for a in dir(HybridLibrary()) if a[:2] != "__"]
     result = json.dumps(result, indent=4)
     verify(result)
 

utest/test_translations.py

@@ -1,6 +1,6 @@
 from pathlib import Path
-import pytest
 
+import pytest
 from SmallLibrary import SmallLibrary
 
 
@@ -9,18 +9,21 @@ def lib():
     translation = Path(__file__).parent.parent / "atest" / "translation.json"
     return SmallLibrary(translation=translation)
 
+
 def test_invalid_translation():
     translation = Path(__file__)
     assert SmallLibrary(translation=translation)
 
+
 def test_translations_names(lib: SmallLibrary):
     keywords = lib.keywords_spec
     assert "other_name" in keywords
     assert "name_changed_again" in keywords
 
+
 def test_translations_docs(lib: SmallLibrary):
     keywords = lib.keywords_spec
     kw = keywords["other_name"]
     assert kw.documentation == "This is new doc"
     kw = keywords["name_changed_again"]
-    assert kw.documentation == "This is also replaced.\n\nnew line."
+    assert kw.documentation == "This is also replaced.\n\nnew line."