IMPROVEMENT: harmless mypy linting fixes

Author: amilcarlucas

MethodicConfigurator/backend_filesystem_program_settings.py

@@ -250,7 +250,7 @@ def set_display_usage_popup(ptype: str, value: bool) -> None:
     @staticmethod
     def get_setting(setting: str) -> Union[int, bool]:
         if setting in SETTINGS_DEFAULTS:
-            return ProgramSettings.__get_settings_as_dict().get(setting, SETTINGS_DEFAULTS[setting])
+            return ProgramSettings.__get_settings_as_dict().get(setting, SETTINGS_DEFAULTS[setting])  # type: ignore[no-any-return]
         return False
 
     @staticmethod

MethodicConfigurator/backend_filesystem_vehicle_components.py

@@ -21,6 +21,7 @@
 from os import path as os_path
 from os import walk as os_walk
 from re import match as re_match
+from typing import Any, Union
 
 from MethodicConfigurator import _
 from MethodicConfigurator.backend_filesystem_program_settings import ProgramSettings
@@ -35,7 +36,7 @@ class VehicleComponents:
 
     def __init__(self) -> None:
         self.vehicle_components_json_filename = "vehicle_components.json"
-        self.vehicle_components = None
+        self.vehicle_components: Union[None, dict[Any, Any]] = None
 
     def load_vehicle_components_json_data(self, vehicle_dir: str):
         data = {}

MethodicConfigurator/backend_flightcontroller.py

@@ -477,7 +477,7 @@ def __list_serial_ports() -> list[serial.tools.list_ports_common.ListPortInfo]:
         comports = serial.tools.list_ports.comports()
         # for port in comports:
         #     logging_debug("ComPort - %s, Description: %s", port.device, port.description)
-        return comports
+        return comports  # type: ignore[no-any-return]
 
     @staticmethod
     def __list_network_ports() -> list[str]:

MethodicConfigurator/backend_flightcontroller_info.py

@@ -157,11 +157,13 @@ def __decode_flight_capabilities(capabilities) -> dict[str, str]:
     # pymavlink.dialects.v20.ardupilotmega.enums["MAV_TYPE"]
     @staticmethod
     def __decode_mav_type(mav_type) -> str:
-        return mavutil.mavlink.enums["MAV_TYPE"].get(mav_type, mavutil.mavlink.EnumEntry("None", "Unknown type")).description
+        return str(
+            mavutil.mavlink.enums["MAV_TYPE"].get(mav_type, mavutil.mavlink.EnumEntry("None", "Unknown type")).description
+        )
 
     @staticmethod
     def __decode_mav_autopilot(mav_autopilot) -> str:
-        return (
+        return str(
             mavutil.mavlink.enums["MAV_AUTOPILOT"]
             .get(mav_autopilot, mavutil.mavlink.EnumEntry("None", "Unknown type"))
             .description

MethodicConfigurator/backend_mavftp.py

@@ -19,7 +19,9 @@
 import time
 from argparse import ArgumentParser
 from datetime import datetime
+from io import BufferedReader, BufferedWriter
 from io import BytesIO as SIO
+from typing import Union
 
 from pymavlink import mavutil
 
@@ -91,17 +93,17 @@ def __init__(  # pylint: disable=too-many-arguments
         opcode,
         size,
         req_opcode,
-        burst_complete,
-        offset,
+        burst_complete: bool,
+        offset: int,
         payload,
     ) -> None:
         self.seq = seq  # Sequence number for the operation.
         self.session = session  # Session identifier.
         self.opcode = opcode  # Operation code indicating the type of FTP operation.
         self.size = size  # Size of the operation.
         self.req_opcode = req_opcode  # Request operation code.
-        self.burst_complete = burst_complete  # (bool) Flag indicating if the burst transfer is complete.
-        self.offset = offset  # Offset for read/write operations.
+        self.burst_complete: bool = burst_complete  # (bool) Flag indicating if the burst transfer is complete.
+        self.offset: int = offset  # Offset for read/write operations.
         self.payload = payload  # (bytes) Payload for the operation.
 
     def pack(self):
@@ -157,8 +159,8 @@ class ParamData:
     """
 
     def __init__(self) -> None:
-        self.params = []  # params as (name, value, ptype)
-        self.defaults = None  # defaults as (name, value, ptype)
+        self.params: list[tuple[str, float, type]] = []  # params as (name, value, ptype)
+        self.defaults: Union[None, list[tuple[str, float, type]]] = None  # defaults as (name, value, ptype)
 
     def add_param(self, name, value, ptype) -> None:
         self.params.append((name, value, ptype))
@@ -183,7 +185,7 @@ class MAVFTPSettings:
     """A collection of MAVFTP settings."""
 
     def __init__(self, s_vars) -> None:
-        self._vars = {}
+        self._vars: dict[str, MAVFTPSetting] = {}
         for v in s_vars:
             self.append(v)
 
@@ -315,40 +317,40 @@ def __init__(
         self.seq = 0
         self.session = 0
         self.network = 0
-        self.last_op = None
-        self.fh = None
-        self.filename = None
+        self.last_op: Union[None, FTP_OP] = None
+        self.fh: Union[None, SIO, BufferedReader, BufferedWriter] = None
+        self.filename: Union[None, str] = None
         self.callback = None
         self.callback_progress = None
         self.put_callback = None
         self.put_callback_progress = None
         self.total_size = 0
-        self.read_gaps = []
-        self.read_gap_times = {}
+        self.read_gaps: list[tuple[int, int]] = []
+        self.read_gap_times: dict[tuple[int, int], float] = {}
         self.last_gap_send = 0.0
         self.read_retries = 0
         self.read_total = 0
         self.remote_file_size = None
         self.duplicates = 0
         self.last_read = None
-        self.last_burst_read = None
-        self.op_start = None
+        self.last_burst_read: Union[None, float] = None
+        self.op_start: Union[None, float] = None
         self.dir_offset = 0
         self.last_op_time = time.time()
         self.last_send_time = time.time()
         self.rtt = 0.5
         self.reached_eof = False
         self.backlog = 0
         self.burst_size = self.ftp_settings.burst_read_size
-        self.write_list = None
+        self.write_list: Union[None, set[int]] = None
         self.write_block_size = 0
         self.write_acks = 0
         self.write_total = 0
         self.write_file_size = 0
         self.write_idx = 0
         self.write_recv_idx = -1
         self.write_pending = 0
-        self.write_last_send = None
+        self.write_last_send: Union[None, float] = None
         self.open_retries = 0
 
         self.master = master
@@ -1217,7 +1219,7 @@ def __decode_ftp_ack_and_nack(self, op: FTP_OP, operation_name: str = "") -> MAV
         )
 
     @staticmethod
-    def ftp_param_decode(data) -> ParamData:  # pylint: disable=too-many-locals
+    def ftp_param_decode(data) -> Union[None, ParamData]:  # pylint: disable=too-many-locals
         """decode parameter data, returning ParamData"""
         pdata = ParamData()
 

MethodicConfigurator/frontend_tkinter_component_editor_base.py

@@ -114,7 +114,7 @@ def __init__(self, version, local_filesystem: LocalFilesystem) -> None:
         show_tooltip(self.save_button, _("Save component data and start parameter value configuration and tuning."))
         self.save_button.pack(pady=7)
         if UsagePopupWindow.should_display("component_editor"):
-            self.root.after(10, self.__display_component_editor_usage_instructions(self.root))
+            self.root.after(10, self.__display_component_editor_usage_instructions(self.root))  # type: ignore[arg-type]
 
     @staticmethod
     def __display_component_editor_usage_instructions(parent: tk.Toplevel) -> None:

MethodicConfigurator/frontend_tkinter_directory_selection.py

@@ -38,7 +38,7 @@ class DirectorySelectionWidgets:
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
-        parent: tk.Toplevel,
+        parent: BaseWindow,
         parent_frame: tk.Widget,
         initialdir: str,
         label_text: str,
@@ -147,7 +147,7 @@ class VehicleDirectorySelectionWidgets(DirectorySelectionWidgets):
 
     def __init__(  # pylint: disable=too-many-arguments
         self,
-        parent: tk.Toplevel,
+        parent: BaseWindow,
         parent_frame: ttk.Widget,
         local_filesystem: LocalFilesystem,
         initial_dir: str,

MethodicConfigurator/frontend_tkinter_flightcontroller_info.py

@@ -68,7 +68,7 @@ def __init__(self, flight_controller: FlightController) -> None:
         logging_info(_("Flight Controller USB vendor ID: %s"), flight_controller.info.vendor)
         logging_info(_("Flight Controller USB product ID: %s"), flight_controller.info.product)
 
-        self.root.after(50, self.download_flight_controller_parameters())  # 50 milliseconds
+        self.root.after(50, self.download_flight_controller_parameters())  # type: ignore[func-returns-value]
         self.root.mainloop()
 
     def download_flight_controller_parameters(self) -> None:

MethodicConfigurator/frontend_tkinter_pair_tuple_combobox.py

@@ -20,6 +20,7 @@
 from platform import system as platform_system
 from sys import exit as sys_exit
 from tkinter import Label, Toplevel, ttk
+from typing import Union
 
 from MethodicConfigurator import _
 from MethodicConfigurator.common_arguments import add_common_arguments_and_parse
@@ -37,8 +38,8 @@ class PairTupleCombobox(ttk.Combobox):  # pylint: disable=too-many-ancestors
     def __init__(self, container, list_pair_tuple, selected_element, cb_name, *args, **kwargs) -> None:
         super().__init__(container, *args, **kwargs)
         self.cb_name = cb_name
-        self.list_keys = []
-        self.list_shows = []
+        self.list_keys: list[str] = []
+        self.list_shows: list[str] = []
         self.set_entries_tupple(list_pair_tuple, selected_element)
         self.bind("<Configure>", self.on_combo_configure, add="+")
 
@@ -133,7 +134,7 @@ class PairTupleComboboxTooltip(PairTupleCombobox):  # pylint: disable=too-many-a
 
     def __init__(self, container, list_pair_tuple, selected_element, cb_name, *args, **kwargs) -> None:
         super().__init__(container, list_pair_tuple, selected_element, cb_name, *args, **kwargs)
-        self.tooltip = None
+        self.tooltip: Union[None, Toplevel] = None
 
         # Bind events related to the dropdown
         pd = self.tk.call("ttk::combobox::PopdownWindow", self)

MethodicConfigurator/frontend_tkinter_parameter_editor.py

@@ -284,11 +284,11 @@ def __init__(self, current_file: str, flight_controller: FlightController, local
         self.__create_parameter_area_widgets()
 
         # trigger a table update to ask the user what to do in the case this file needs special actions
-        self.root.after(10, self.on_param_file_combobox_change(None, True))
+        self.root.after(10, self.on_param_file_combobox_change(None, True))  # type: ignore[func-returns-value]
 
         # this one should be on top of the previous one hence the longer time
         if UsagePopupWindow.should_display("parameter_editor"):
-            self.root.after(100, self.__display_usage_popup_window(self.root))
+            self.root.after(100, self.__display_usage_popup_window(self.root))  # type: ignore[arg-type]
         self.root.mainloop()
 
     def __create_conf_widgets(self, version: str) -> None:
@@ -301,7 +301,7 @@ def __create_conf_widgets(self, version: str) -> None:
         # Create a new frame inside the config_subframe for the intermediate parameter file directory selection labels
         # and directory selection button
         directory_selection_frame = VehicleDirectorySelectionWidgets(
-            self.root, config_subframe, self.local_filesystem, self.local_filesystem.vehicle_dir, destroy_parent_on_open=False
+            self, config_subframe, self.local_filesystem, self.local_filesystem.vehicle_dir, destroy_parent_on_open=False
         )
         directory_selection_frame.container_frame.pack(side=tk.LEFT, fill="x", expand=False, padx=(4, 6))