fix(ty): fix issues found by ty 0.0.32 type linter

Author: amilcarlucas

tests/test_backend_filesystem.py

@@ -531,13 +531,13 @@ def test_tolerance_check_with_zero_values(self) -> None:
         # Test writing
         test_filename = "test_param.param"
         expected_path = os_path.join("vehicle_dir", "last_uploaded_filename.txt")
-        with patch("builtins.open", unittest.mock.mock_open()) as mock_file:
+        with patch("builtins.open", mock_open()) as mock_file:
             lfs.write_last_uploaded_filename(test_filename)
             mock_file.assert_called_once_with(expected_path, "w", encoding="utf-8", newline="\n")
             mock_file().write.assert_called_once_with(test_filename)
 
         # Test reading
-        with patch("builtins.open", unittest.mock.mock_open(read_data=test_filename)) as mock_file:
+        with patch("builtins.open", mock_open(read_data=test_filename)) as mock_file:
             result = lfs._LocalFilesystem__read_last_uploaded_filename()  # pylint: disable=protected-access
             assert result == test_filename
             mock_file.assert_called_once_with(expected_path, encoding="utf-8")

tests/test_backend_filesystem_configuration_steps.py

@@ -12,7 +12,7 @@
 
 import unittest
 from json import JSONDecodeError
-from unittest.mock import mock_open, patch
+from unittest.mock import Mock, call, mock_open, patch
 
 from ardupilot_methodic_configurator.backend_filesystem_configuration_steps import ConfigurationSteps
 
@@ -31,10 +31,10 @@ def setUp(self) -> None:
     @patch("os.path.abspath")
     def test_re_init(
         self,
-        mock_abspath: unittest.mock.Mock,
-        mock_dirname: unittest.mock.Mock,
-        mock_join: unittest.mock.Mock,
-        mock_open2: unittest.mock.Mock,
+        mock_abspath: Mock,
+        mock_dirname: Mock,
+        mock_join: Mock,
+        mock_open2: Mock,
     ) -> None:
         mock_abspath.return_value = "abs_path"
         mock_dirname.return_value = "dir_name"
@@ -43,8 +43,8 @@ def test_re_init(
         assert self.config_steps.configuration_steps
         mock_open2.assert_has_calls(
             [
-                unittest.mock.call("vehicle_dir/configuration_steps_vehicle_type.json", encoding="utf-8-sig"),
-                unittest.mock.call("dir_name/configuration_steps_schema.json", encoding="utf-8"),
+                call("vehicle_dir/configuration_steps_vehicle_type.json", encoding="utf-8-sig"),
+                call("dir_name/configuration_steps_schema.json", encoding="utf-8"),
             ],
             any_order=True,
         )

tests/test_backend_flightcontroller_connection.py

@@ -16,13 +16,16 @@
 from __future__ import annotations
 
 from time import time as real_time
-from typing import NoReturn
+from typing import TYPE_CHECKING, NoReturn, Optional
 from unittest.mock import Mock, patch
 
 import pytest
 import serial.tools.list_ports_common
 from pymavlink import mavutil
 
+if TYPE_CHECKING:
+    from ardupilot_methodic_configurator.backend_flightcontroller_protocols import MavlinkConnection
+
 from ardupilot_methodic_configurator.backend_flightcontroller_connection import (
     DEFAULT_BAUDRATE,
     SUPPORTED_BAUDRATES,
@@ -855,14 +858,14 @@ def test_failed_connection_includes_root_cause(self) -> None:
         class ExplodingFactory(SystemMavlinkConnectionFactory):  # pylint: disable=too-few-public-methods
             """MAVLink factory that always raises ConnectionError."""
 
-            def create(  # type: ignore[override] # pylint: disable=too-many-arguments, too-many-positional-arguments
+            def create(  # pylint: disable=too-many-arguments, too-many-positional-arguments
                 self,
                 device: str,
                 baudrate: int,
                 timeout: float = 5.0,
                 retries: int = 3,
-                progress_callback: object = None,
-            ) -> object:
+                progress_callback: Optional[object] = None,  # noqa: UP045
+            ) -> Optional[MavlinkConnection]:  # noqa: UP045
                 _ = (baudrate, timeout, retries, progress_callback)
                 msg = f"{device}: Permission denied"
                 raise ConnectionError(msg)

tests/test_extract_param_defaults.py

@@ -11,7 +11,7 @@
 """
 
 import unittest
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, call, patch
 
 import pytest
 
@@ -297,7 +297,7 @@ def test_output_params(self, mock_print_) -> None:
         output_params(defaults, "missionplanner")
 
         # Check if the print function was called with the correct parameters
-        expected_calls = [unittest.mock.call("PARAM2,1"), unittest.mock.call("PARAM1,2")]
+        expected_calls = [call("PARAM2,1"), call("PARAM1,2")]
         mock_print_.assert_has_calls(expected_calls, any_order=False)
 
     @patch("builtins.print")
@@ -309,7 +309,7 @@ def test_output_params_missionplanner_non_numeric(self, mock_print_) -> None:
         output_params(defaults, "missionplanner")
 
         # Check if the print function was called with the correct parameters
-        expected_calls = [unittest.mock.call("PARAM1,non-numeric")]
+        expected_calls = [call("PARAM1,non-numeric")]
         mock_print_.assert_has_calls(expected_calls, any_order=False)
 
     @patch("builtins.print")
@@ -323,8 +323,8 @@ def test_output_params_mavproxy(self, mock_print_) -> None:
 
         # Check if the print function was called with the correct parameters
         expected_calls = [
-            unittest.mock.call("%-15s %.6f" % ("PARAM1", 1.0)),  # pylint: disable=consider-using-f-string
-            unittest.mock.call("%-15s %.6f" % ("PARAM2", 2.0)),  # pylint: disable=consider-using-f-string
+            call("%-15s %.6f" % ("PARAM1", 1.0)),  # pylint: disable=consider-using-f-string
+            call("%-15s %.6f" % ("PARAM2", 2.0)),  # pylint: disable=consider-using-f-string
         ]
         mock_print_.assert_has_calls(expected_calls, any_order=False)
 
@@ -339,9 +339,9 @@ def test_output_params_qgcs(self, mock_print_) -> None:
 
         # Check if the print function was called with the correct parameters
         expected_calls = [
-            unittest.mock.call("\n# # Vehicle-Id Component-Id Name Value Type\n"),
-            unittest.mock.call("%u %u %-15s %.6f %u" % (1, 1, "PARAM1", 1.0, 9)),  # pylint: disable=consider-using-f-string
-            unittest.mock.call("%u %u %-15s %.6f %u" % (1, 1, "PARAM2", 2.0, 9)),  # pylint: disable=consider-using-f-string
+            call("\n# # Vehicle-Id Component-Id Name Value Type\n"),
+            call("%u %u %-15s %.6f %u" % (1, 1, "PARAM1", 1.0, 9)),  # pylint: disable=consider-using-f-string
+            call("%u %u %-15s %.6f %u" % (1, 1, "PARAM2", 2.0, 9)),  # pylint: disable=consider-using-f-string
         ]
         mock_print_.assert_has_calls(expected_calls, any_order=False)
 
@@ -356,9 +356,9 @@ def test_output_params_qgcs_2_4(self, mock_print_) -> None:
 
         # Check if the print function was called with the correct parameters
         expected_calls = [
-            unittest.mock.call("\n# # Vehicle-Id Component-Id Name Value Type\n"),
-            unittest.mock.call("%u %u %-15s %.6f %u" % (2, 4, "PARAM1", 1.0, 9)),  # pylint: disable=consider-using-f-string
-            unittest.mock.call("%u %u %-15s %.6f %u" % (2, 4, "PARAM2", 2.0, 9)),  # pylint: disable=consider-using-f-string
+            call("\n# # Vehicle-Id Component-Id Name Value Type\n"),
+            call("%u %u %-15s %.6f %u" % (2, 4, "PARAM1", 1.0, 9)),  # pylint: disable=consider-using-f-string
+            call("%u %u %-15s %.6f %u" % (2, 4, "PARAM2", 2.0, 9)),  # pylint: disable=consider-using-f-string
         ]
         mock_print_.assert_has_calls(expected_calls, any_order=False)
 
@@ -373,10 +373,10 @@ def test_output_params_qgcs_SYSID_THISMAV(self, mock_print_) -> None:  # noqa: N
 
         # Check if the print function was called with the correct parameters
         expected_calls = [
-            unittest.mock.call("\n# # Vehicle-Id Component-Id Name Value Type\n"),
-            unittest.mock.call("%u %u %-15s %.6f %u" % (3, 7, "PARAM1", 1.0, 9)),  # pylint: disable=consider-using-f-string
-            unittest.mock.call("%u %u %-15s %.6f %u" % (3, 7, "PARAM2", 2.0, 9)),  # pylint: disable=consider-using-f-string
-            unittest.mock.call("%u %u %-15s %.6f %u" % (3, 7, "SYSID_THISMAV", 3.0, 9)),  # pylint: disable=consider-using-f-string
+            call("\n# # Vehicle-Id Component-Id Name Value Type\n"),
+            call("%u %u %-15s %.6f %u" % (3, 7, "PARAM1", 1.0, 9)),  # pylint: disable=consider-using-f-string
+            call("%u %u %-15s %.6f %u" % (3, 7, "PARAM2", 2.0, 9)),  # pylint: disable=consider-using-f-string
+            call("%u %u %-15s %.6f %u" % (3, 7, "SYSID_THISMAV", 3.0, 9)),  # pylint: disable=consider-using-f-string
         ]
         mock_print_.assert_has_calls(expected_calls, any_order=False)
 
@@ -420,7 +420,7 @@ def test_output_params_integer(self, mock_print_) -> None:
         output_params(defaults, "missionplanner")
 
         # Check if the print function was called with the correct parameters
-        expected_calls = [unittest.mock.call("PARAM1,1.01"), unittest.mock.call("PARAM2,2")]
+        expected_calls = [call("PARAM1,1.01"), call("PARAM2,2")]
         mock_print_.assert_has_calls(expected_calls, any_order=False)
 
     @patch("builtins.print")

tests/test_frontend_tkinter_stage_progress.py

@@ -12,6 +12,7 @@
 
 import tkinter as tk
 from collections.abc import Generator
+from tkinter import ttk
 
 import pytest
 
@@ -244,7 +245,7 @@ def test_user_sees_labels_adjust_when_window_resizes(self, progress_bar) -> None
         initial_wraplengths = {}
         for phase_name, frame in progress_bar.phase_frames.items():
             for child in frame.winfo_children():
-                if isinstance(child, tk.ttk.Label):
+                if isinstance(child, ttk.Label):
                     initial_wraplengths[phase_name] = child.cget("wraplength")
 
         # Simulate window resize by updating width and calling resize handler
@@ -254,7 +255,7 @@ def test_user_sees_labels_adjust_when_window_resizes(self, progress_bar) -> None
         # Verify wraplength has been updated for all phase labels
         for phase_name, frame in progress_bar.phase_frames.items():
             for child in frame.winfo_children():
-                if isinstance(child, tk.ttk.Label):
+                if isinstance(child, ttk.Label):
                     # Wraplength should be set to a positive value
                     current_wraplength = child.cget("wraplength")
                     initial_wraplength = initial_wraplengths[phase_name]
@@ -283,10 +284,10 @@ def test_user_sees_optional_phases_displayed_in_gray(self, progress_bar) -> None
         optional_label = None
         normal_label = None
         for child in optional_frame.winfo_children():
-            if isinstance(child, tk.ttk.Label):
+            if isinstance(child, ttk.Label):
                 optional_label = child
         for child in normal_frame.winfo_children():
-            if isinstance(child, tk.ttk.Label):
+            if isinstance(child, ttk.Label):
                 normal_label = child
 
         assert optional_label is not None
@@ -314,9 +315,9 @@ def test_user_sees_correct_frame_structure_for_each_phase(self, progress_bar) ->
         progressbar = None
         label = None
         for child in children:
-            if isinstance(child, tk.ttk.Progressbar):
+            if isinstance(child, ttk.Progressbar):
                 progressbar = child
-            elif isinstance(child, tk.ttk.Label):
+            elif isinstance(child, ttk.Label):
                 label = child
 
         assert progressbar is not None, "Progressbar should exist"
@@ -363,7 +364,7 @@ def test_user_sees_very_short_labels_formatted_with_padding(self, root_window) -
         frame = progress.phase_frames["A"]
         label = None
         for child in frame.winfo_children():
-            if isinstance(child, tk.ttk.Label):
+            if isinstance(child, ttk.Label):
                 label = child
                 break
 
@@ -385,7 +386,7 @@ def test_user_sees_short_labels_formatted_with_newlines(self, root_window) -> No
         frame = progress.phase_frames["Short"]
         label = None
         for child in frame.winfo_children():
-            if isinstance(child, tk.ttk.Label):
+            if isinstance(child, ttk.Label):
                 label = child
                 break
 
@@ -407,7 +408,7 @@ def test_user_sees_medium_labels_with_spaces_split_at_first_space(self, root_win
         frame = progress.phase_frames["Medium Text"]
         label = None
         for child in frame.winfo_children():
-            if isinstance(child, tk.ttk.Label):
+            if isinstance(child, ttk.Label):
                 label = child
                 break
 

tests/unit_frontend_tkinter_software_update.py

@@ -12,7 +12,7 @@
 
 import tkinter as tk
 import unittest
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, call, patch
 
 from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_software_update import UpdateDialog
@@ -141,7 +141,7 @@ def test_init_window_config(self) -> None:
 
         # Check that grid_columnconfigure was called exactly twice with the right arguments
         assert dialog.frame.grid_columnconfigure.call_count == 2  # pylint: disable=no-member
-        dialog.frame.grid_columnconfigure.assert_has_calls([unittest.mock.call(0, weight=1), unittest.mock.call(1, weight=1)])  # pylint: disable=no-member
+        dialog.frame.grid_columnconfigure.assert_has_calls([call(0, weight=1), call(1, weight=1)])  # pylint: disable=no-member
 
     def test_init_scroll_frame(self) -> None:
         """Test ScrollFrame setup during initialization."""