Fixed new ruff formatting

Author: Robert Roos

src/tctools/common.py

@@ -52,7 +52,9 @@ def __init__(self, *args):
 
         # All the fields were are going to have in the arguments output:
         fields = {
-            action.dest for action in parser._actions if action.dest != "help"  # noqa
+            action.dest
+            for action in parser._actions
+            if action.dest != "help"  # noqa
         }
 
         self.config_file: Path | None = None
@@ -243,7 +245,7 @@ def set_main_argument(cls, parser):
     @staticmethod
     def get_xml_header(file: str) -> str | None:
         """Get raw XML header as string."""
-        with open(file, "r") as fh:
+        with open(file) as fh:
             # Search only the start of the path, otherwise give up
             for _ in range(100):
                 line = fh.readline()

src/tctools/format/format_class.py

@@ -148,7 +148,7 @@ def format_file(self, path: str):
         The path is read as text and code inside XML tags is detected manually. Other
         lines of XML remain untouched.
         """
-        with open(path, "r", encoding="utf-8", errors="ignore", newline="") as fh:
+        with open(path, encoding="utf-8", errors="ignore", newline="") as fh:
             content = fh.readlines()
 
         self._file = path
@@ -211,7 +211,7 @@ def split_code_segments(content: list[str]):
 
         # Iterate over pairs of regions so we got the start and end together
         for (rowcol_prev, kind_prev, name_prev), (rowcol, _, _) in zip(
-            regions[:-1], regions[1:]
+            regions[:-1], regions[1:], strict=False
         ):
             lines = content[rowcol_prev[0] : (rowcol[0] + 1)]  # Inclusive range
 

src/tctools/format/format_rules.py

@@ -74,7 +74,7 @@ def get_property(
         if value_type is None:
             return value  # Unprocessed
 
-        if value_type == bool:
+        if value_type is bool:
             if isinstance(value, str):
                 return value in ["TRUE", "True", "true", "1"]
             return bool(value)
@@ -324,7 +324,7 @@ def format_argument_list(self, content: list[str]):
 
         for i, line_chunks in variable_definitions.items():
             new_line = ""
-            for chunk, indent in zip(line_chunks, chunk_indent_levels):
+            for chunk, indent in zip(line_chunks, chunk_indent_levels, strict=True):
                 if chunk:
                     if indent > 0:
                         new_line += self._pad_to_indent_level(new_line, indent)

src/tctools/patch_plc/patch_plc_class.py

@@ -295,7 +295,7 @@ def determine_source_folders(self, source_files: Iterable[Path]) -> FileItems:
                 raise ValueError(
                     f"Source file `{file}` is not relative to project "
                     f"directory `{project_dir}`"
-                )
+                ) from None
             else:
                 if relative_path.name in self.args.ignore:
                     continue  # Skip this file if the name matches exactly
@@ -356,53 +356,57 @@ def sources_to_remove(
         """
         to_remove = FileItems()
 
-        remove_items = [to_remove.files]
-        sources_items = [current.files]
-        if self.args.recursive:  # Don't touch folders without `-r`
-            remove_items.append(to_remove.folders)
-            sources_items.append(current.folders)
-
         project_folder = self._project_file.parent
 
-        for remove_list, sources_list in zip(remove_items, sources_items):
+        def remove_helper(remove_list, sources_list):
             for item in sources_list:
-                for target in new_sources.keys():
+                for target in new_sources:
                     if target.is_absolute():
                         target = target.relative_to(project_folder)
                     if item == target or (
                         self.args.recursive and item.is_relative_to(target)
                     ):  # Exact match without `-r`, also relative with
                         remove_list.add(item)
 
+        remove_helper(to_remove.files, current.files)
+        if self.args.recursive:  # Don't touch folders without `-r`
+            remove_helper(to_remove.folders, current.folders)
+
         return to_remove
 
     def xml_add_sources(self, sources: FileItems):
         """Modify the files and folders elements in-place."""
-        for ref_elements, ref_set, template in zip(
-            [self._element_folders, self._element_files],
-            [sources.folders, sources.files],
-            [
-                '<Folder Include="{}"/>',
-                '<Compile Include="{}"><SubType>Code</SubType></Compile>',
-            ],
-        ):  # Repeat for folders and then for files
+
+        def add_helper(ref_elements, ref_set, template):
             for item in ref_set:
                 item_str = self.path_to_str(item)
                 xml = template.format(item_str)
                 ref_elements.append(etree.XML(xml))
 
+        add_helper(
+            self._element_folders,
+            sources.folders,
+            '<Folder Include="{}"/>',  # ...
+        )
+        add_helper(
+            self._element_files,
+            sources.files,
+            '<Compile Include="{}"><SubType>Code</SubType></Compile>',
+        )
+
     def xml_remove_source(self, to_remove: FileItems):
         """Modify the files and folders elements in-place."""
-        for ref_elements, ref_set in zip(
-            [self._element_folders, self._element_files],
-            [to_remove.folders, to_remove.files],
-        ):  # Repeat for folders and then for files
+
+        def remove_helper(ref_elements, ref_set):
             for element in ref_elements:
                 this_path = Path(PureWindowsPath(element.attrib["Include"]))
                 # Force XML Windows path to native one
                 if this_path in ref_set:
                     ref_elements.remove(element)
 
+        remove_helper(self._element_folders, to_remove.folders)
+        remove_helper(self._element_files, to_remove.files)
+
     @staticmethod
     def path_to_str(path: PurePath) -> str:
         """Turn any path into a windows-path string.

tests/conftest.py

@@ -39,7 +39,7 @@ def check_line(expected_line: str, line_to_check: str) -> bool:
             return expected_line in line_to_check
         return expected[idx].strip() == line.strip()
 
-    with open(file, "r") as fh:
+    with open(file) as fh:
         count = 0
         while True:
             count += 1
@@ -58,9 +58,9 @@ def check_line(expected_line: str, line_to_check: str) -> bool:
                     if check_line(ex_line, line):
                         assert not check_true
 
-    assert (
-        idx == len(expected)
-    ) == check_true, "Did not encounter right number of expected lines"
+    assert (idx == len(expected)) == check_true, (
+        "Did not encounter right number of expected lines"
+    )
 
 
 def assert_strings_have_substrings(expected: list[list[str]], actual: list[str]):

tests/test_common.py

@@ -52,7 +52,7 @@ def test_cli_version(self, capsys):
         with pytest.raises(SystemExit) as err:
             _ = MyTool("--version")
 
-        assert err.type == SystemExit
+        assert err.type is SystemExit
 
         message = capsys.readouterr().out
         assert message

tests/test_formatter.py

@@ -14,7 +14,7 @@ def test_help(capsys):
     with pytest.raises(SystemExit) as err:
         tctools.format.__main__.main("--help")
 
-    assert err.type == SystemExit
+    assert err.type is SystemExit
 
     message = capsys.readouterr().out
     assert "usage:" in message

tests/test_git_info.py

@@ -14,7 +14,7 @@ def test_help(capsys):
     with pytest.raises(SystemExit) as err:
         tctools.git_info.__main__.main("--help")
 
-    assert err.type == SystemExit
+    assert err.type is SystemExit
 
     message = capsys.readouterr().out
     assert "usage:" in message

tests/test_make_release.py

@@ -41,7 +41,7 @@ def test_help(capsys):
     with pytest.raises(SystemExit) as err:
         tctools.make_release.__main__.main("--help")
 
-    assert err.type == SystemExit
+    assert err.type is SystemExit
 
     message = capsys.readouterr().out
     assert "usage: " in message

tests/test_patch_plc.py

@@ -25,7 +25,7 @@ def test_help(capsys):
     with pytest.raises(SystemExit) as err:
         patch_plc_main("--help")
 
-    assert err.type == SystemExit
+    assert err.type is SystemExit
 
     message = capsys.readouterr().out
     assert "usage:" in message
@@ -59,9 +59,12 @@ def test_merge_single_file(plc_code):
 
     project_content = project.read_text()
 
-    assert """<Compile Include="POUs\\untracked_source\\F_UntrackedFunc.TcPOU">
+    assert (
+        """<Compile Include="POUs\\untracked_source\\F_UntrackedFunc.TcPOU">
       <SubType>Code</SubType>
-    </Compile>""" in project_content
+    </Compile>"""
+        in project_content
+    )
 
     assert '<Folder Include="POUs\\untracked_source"/>' in project_content