fix(ruff): fix lint errors found by the latest ruff

Author: amilcarlucas

ardupilot_methodic_configurator/annotate_params.py

@@ -157,6 +157,10 @@ def __eq__(self, other: object) -> bool:
             return self.value == other.value and self.comment == other.comment
         return False
 
+    def __hash__(self) -> int:
+        """Hash operation for using Par objects in sets and as dict keys."""
+        return hash((self.value, self.comment))
+
     @staticmethod
     def load_param_file_into_dict(param_file: str) -> dict[str, "Par"]:
         """
@@ -319,8 +323,7 @@ def export_to_param(formatted_params: list[str], filename_out: str) -> None:
         try:
             # Ensure newline character is LF, even on windows
             with open(filename_out, "w", encoding="utf-8", newline="\n") as output_file:
-                for line in formatted_params:
-                    output_file.write(line + "\n")
+                output_file.writelines(line + "\n" for line in formatted_params)
         except OSError as e:
             msg = f"ERROR: writing to file {filename_out}: {e}"
             raise SystemExit(msg) from e

ardupilot_methodic_configurator/backend_filesystem.py

@@ -511,8 +511,7 @@ def copy_template_files_to_new_vehicle_dir(
                     with open(source, encoding="utf-8") as file:
                         lines = file.readlines()
                     with open(dest, "w", encoding="utf-8") as file:
-                        for line in lines:
-                            file.write(line.split("#")[0].strip() + "\n")
+                        file.writelines(line.split("#")[0].strip() + "\n" for line in lines)
                 elif os_path.isdir(source):
                     shutil_copytree(source, dest)
                 else:
@@ -742,7 +741,7 @@ def get_upload_local_and_remote_filenames(self, selected_file: str) -> tuple[str
     def get_git_commit_hash() -> str:
         # Try to get git hash using git command
         try:
-            result = run(  # noqa: S603
+            result = run(
                 ["git", "rev-parse", "HEAD"],  # noqa: S607
                 capture_output=True,
                 text=True,

extract_missing_translations.py

@@ -211,8 +211,7 @@ def output_to_files(missing_translations: list[tuple[int, str]], output_file_bas
 
         # Write untranslated msgids along with their indices to the output file
         with open(current_output_file, "w", encoding="utf-8") as f:
-            for index, item in missing_translations[start_index:end_index]:
-                f.write(f"{index}:{item}\n")
+            f.writelines(f"{index}:{item}\n" for index, item in missing_translations[start_index:end_index])
 
 
 def main() -> None:

pyproject.toml

@@ -211,6 +211,9 @@ indent-width = 4
 "ardupilot_methodic_configurator/backend_mavftp.py" = ["PGH004", "N801", "ANN001"]
 "ardupilot_methodic_configurator/backend_mavftp_example.py" = ["ANN001"]
 "ardupilot_methodic_configurator/tempcal_imu.py" = ["ANN001"]
+"ardupilot_methodic_configurator/annotate_params.py" = ["PLC0415"]
+"ardupilot_methodic_configurator/frontend_tkinter_component_editor_base.py" = ["PLC0415"]
+"ardupilot_methodic_configurator/frontend_tkinter_pair_tuple_combobox.py" = ["PLC0415"]
 
 [tool.ruff.lint.mccabe]
 max-complexity = 22  # Default is 10

scripts/crawl_ardupilot_wiki.py

@@ -200,22 +200,19 @@ def main() -> None:
         except (requests.RequestException, requests.Timeout) as e:
             logging.error("Network error crawling %s: %s", current_url, str(e))
             broken_urls.add(current_url)
-            if current_url in visited_urls:
-                visited_urls.remove(current_url)
+            visited_urls.discard(current_url)
         except (KeyError, ValueError) as e:
             logging.error("URL processing error for %s: %s", current_url, str(e))
             broken_urls.add(current_url)
-            if current_url in visited_urls:
-                visited_urls.remove(current_url)
+            visited_urls.discard(current_url)
     output_urls(visited_urls, broken_urls, start_time)
 
 
 def output_urls(visited_urls: set[str], broken_urls: set[str], start_time: float) -> None:
     # Write all html URLs to file
     raw_pages = len(visited_urls)
     with open("gurubase.io_url_list_raw.txt", "w", encoding="utf-8") as f:
-        for url in sorted(visited_urls):
-            f.write(f"{url}\n")  # Output to file
+        f.writelines(f"{url}\n" for url in sorted(visited_urls))  # Output to file
 
     visited_urls -= set(URL_BLACKLIST)
     dedup_urls = remove_duplicates(visited_urls)

tests/test_backend_filesystem.py

@@ -951,17 +951,28 @@ def test_copy_template_files_with_blank_change_reason(  # pylint: disable=too-ma
         mock_isdir.side_effect = lambda path: path.endswith("dir1")
 
         lfs = LocalFilesystem(
-            "vehicle_dir", "vehicle_type", None, allow_editing_template_files=False, save_component_to_system_templates=False
+            "vehicle_dir",
+            "vehicle_type",
+            "4.5.0",
+            allow_editing_template_files=False,
+            save_component_to_system_templates=False,
         )
 
         # Test with blank_change_reason=True
         lfs.copy_template_files_to_new_vehicle_dir("template_dir", "new_vehicle_dir", blank_change_reason=True)
 
         # Verify file handling when blank_change_reason=True
-        write_calls = mock_open_file().write.call_args_list
-        # Check that comments were removed for param files
-        assert any(call[0][0] == "PARAM1,1.0\n" for call in write_calls)
-        assert any(call[0][0] == "PARAM2,2.0\n" for call in write_calls)
+        # First check if writelines was called at all
+        assert mock_open_file().writelines.called, "writelines should have been called for .param files"
+
+        # Get the arguments passed to writelines
+        writelines_calls = mock_open_file().writelines.call_args_list
+        assert len(writelines_calls) > 0, "Expected at least one writelines call"
+
+        # Convert the generator to list to check content
+        lines_written = list(writelines_calls[0][0][0])  # Convert generator to list
+        assert "PARAM1,1.0\n" in lines_written, f"Expected 'PARAM1,1.0\\n' in {lines_written}"
+        assert "PARAM2,2.0\n" in lines_written, f"Expected 'PARAM2,2.0\\n' in {lines_written}"
 
         # Verify directory was copied with copytree
         mock_copytree.assert_called_with("template_dir/dir1", "new_vehicle_dir/dir1")
@@ -1055,10 +1066,8 @@ def test_merge_forced_or_derived_parameters_none_parameters() -> None:
         "vehicle_dir", "vehicle_type", None, allow_editing_template_files=False, save_component_to_system_templates=False
     )
     test_file = "test.json"
-    lfs.file_parameters = {test_file: {}}
-
-    # Test with None parameters
-    lfs.merge_forced_or_derived_parameters(test_file, None, [])
+    lfs.file_parameters = {test_file: {}}  # Test with empty dict instead of None (None is not valid type)
+    lfs.merge_forced_or_derived_parameters(test_file, {}, [])
     assert lfs.file_parameters[test_file] == {}
 
     # Test with empty dict

tests/test_battery_cell_voltages.py

@@ -11,7 +11,7 @@
 """
 
 import unittest
-from math import nan
+from math import isnan
 
 from ardupilot_methodic_configurator.battery_cell_voltages import BatteryCell, battery_cell_voltages
 
@@ -34,15 +34,15 @@ def test_limit_min_voltage(self) -> None:
 
     def test_recommended_max_voltage(self) -> None:
         assert BatteryCell.recommended_max_voltage("LiIon") == 4.1
-        assert BatteryCell.recommended_max_voltage("NonExistentChemistry") is nan
+        assert isnan(BatteryCell.recommended_max_voltage("NonExistentChemistry"))
 
     def test_recommended_low_voltage(self) -> None:
         assert BatteryCell.recommended_low_voltage("LiIon") == 3.1
-        assert BatteryCell.recommended_low_voltage("NonExistentChemistry") is nan
+        assert isnan(BatteryCell.recommended_low_voltage("NonExistentChemistry"))
 
     def test_recommended_crit_voltage(self) -> None:
         assert BatteryCell.recommended_crit_voltage("LiIon") == 2.8
-        assert BatteryCell.recommended_crit_voltage("NonExistentChemistry") is nan
+        assert isnan(BatteryCell.recommended_crit_voltage("NonExistentChemistry"))
 
     def test_voltage_monoticity(self) -> None:
         for chemistry in BatteryCell.chemistries():