[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

benchmarks/tooltip_performance.py

@@ -18,7 +18,8 @@
 import statistics
 import time
 import tkinter as tk
-from typing import Callable, NamedTuple
+from collections.abc import Callable
+from typing import NamedTuple
 
 try:
     import psutil

merge_pot_file.py

@@ -18,7 +18,6 @@
 import tempfile
 from pathlib import Path
 from platform import system as platform_system
-from typing import Optional
 
 
 def process_locale_directory(locale_dir: Path, pot_file: Path, logger: logging.Logger) -> bool:
@@ -51,7 +50,7 @@ def process_locale_directory(locale_dir: Path, pot_file: Path, logger: logging.L
     return False
 
 
-def validate_and_get_tools(pot_file: Path, po_file: Path, logger: logging.Logger) -> tuple[bool, Optional[str], Optional[str]]:
+def validate_and_get_tools(pot_file: Path, po_file: Path, logger: logging.Logger) -> tuple[bool, str | None, str | None]:
     """
     Validate inputs and determine msgmerge/msgattrib executable paths.
 

scripts/batch_convert_motor_diagrams.py

@@ -24,7 +24,6 @@
 import shutil
 from io import BytesIO
 from pathlib import Path
-from typing import Union
 
 from PIL import Image
 from selenium import webdriver
@@ -76,7 +75,7 @@ def crop_whitespace(image: Image.Image, margin: int = 5) -> Image.Image:
     return image.crop((left, top, right, bottom))
 
 
-def setup_firefox_service() -> tuple[Union[FirefoxService, None], str]:
+def setup_firefox_service() -> tuple[FirefoxService | None, str]:
     """Set up Firefox service with geckodriver fallback logic."""
     # Create Firefox driver with fallback for geckodriver
     try:

scripts/calculate_code_statistics.py

@@ -22,7 +22,7 @@
 import json
 import sys
 from pathlib import Path
-from typing import Any, Union
+from typing import Any
 
 try:
     from pycloc import CLOC  # ty: ignore[unresolved-import]
@@ -49,8 +49,8 @@
 
 def get_cloc_stats(
     path: str,
-    include_patterns: Union[list[str], None] = None,
-    exclude_patterns: Union[list[str], None] = None,
+    include_patterns: list[str] | None = None,
+    exclude_patterns: list[str] | None = None,
 ) -> dict[str, Any]:
     """Get cloc statistics for a given path with optional include/exclude patterns."""
     cloc_cmd = CLOC().add_flag("--json")

scripts/crawl_ardupilot_wiki.py

@@ -19,7 +19,6 @@
 import logging
 import time
 from os import environ as os_environ
-from typing import Union
 from urllib.parse import urljoin, urlparse
 
 import requests
@@ -68,7 +67,7 @@
 
 
 # pylint: disable=duplicate-code
-def get_env_proxies() -> Union[dict[str, str], None]:
+def get_env_proxies() -> dict[str, str] | None:
     proxies_env = {
         "http": os_environ.get("HTTP_PROXY") or os_environ.get("http_proxy"),
         "https": os_environ.get("HTTPS_PROXY") or os_environ.get("https_proxy"),

scripts/motor_diagrams_viewer_app.py

@@ -22,7 +22,6 @@
 import tkinter as tk
 from pathlib import Path
 from tkinter import messagebox, ttk
-from typing import Optional
 
 from batch_convert_motor_diagrams import crop_whitespace
 from PIL import Image
@@ -60,7 +59,7 @@ def __init__(
 
         # Initialize variables
         self.svg_files: list[Path] = []
-        self.current_image: Optional[tk.PhotoImage] = None
+        self.current_image: tk.PhotoImage | None = None
         self.temp_dir = tempfile.mkdtemp()
         self.image_width = image_width
         self.image_height = image_height

tests/acceptance_battery_monitor.py

@@ -14,8 +14,8 @@
 """
 
 import tkinter as tk
+from collections.abc import Callable
 from math import nan
-from typing import Callable
 from unittest.mock import MagicMock
 
 import pytest

tests/acceptance_bitmask_parameter_editor_usage_popup.py

@@ -12,8 +12,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Callable, Optional, cast
+from typing import TYPE_CHECKING, Optional, cast
 from unittest.mock import MagicMock
 
 from ardupilot_methodic_configurator.backend_filesystem_program_settings import USAGE_POPUP_WINDOWS

tests/acceptance_zip_for_forum_help.py

@@ -18,7 +18,7 @@
 from datetime import datetime, timezone
 from pathlib import Path
 from types import MethodType, SimpleNamespace
-from typing import Any, Optional, Union, cast
+from typing import Any, cast
 from unittest.mock import MagicMock, patch
 from zipfile import ZipFile
 
@@ -94,7 +94,7 @@ def get_filesystem(parameter_editor: ParameterEditor) -> LocalFilesystem:
 def configure_filesystem(
     parameter_editor: ParameterEditor,
     vehicle_dir: Path,
-    parameter_files: Optional[list[str]] = None,
+    parameter_files: list[str] | None = None,
 ) -> LocalFilesystem:
     """Configure filesystem directory and parameter files for a test."""
     filesystem = get_filesystem(parameter_editor)
@@ -106,8 +106,8 @@ def configure_filesystem(
 def create_forum_help_zip(
     parameter_editor: ParameterEditor,
     *,
-    show_info: Optional[MagicMock] = None,
-    show_error: Optional[MagicMock] = None,
+    show_info: MagicMock | None = None,
+    show_error: MagicMock | None = None,
 ) -> Path:
     """Execute the public workflow helper and return the created zip path."""
     info_callback = show_info or MagicMock()
@@ -131,7 +131,7 @@ def create_forum_help_zip(
 def setup_zip_mock(
     parameter_editor: ParameterEditor,
     vehicle_dir: Path,
-    file_parameters: Mapping[str, Union[ParDict, Mapping[str, Any], None]],
+    file_parameters: Mapping[str, ParDict | Mapping[str, Any] | None],
     configuration_steps_filename: str = "configuration_steps_ArduCopter.json",
 ) -> None:
     """

tests/bdd_frontend_tkinter_show.py

@@ -17,7 +17,6 @@
 import tkinter as tk
 from collections.abc import Generator
 from tkinter import TclError
-from typing import Optional
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -423,7 +422,7 @@ def test_system_returns_correct_monitor_bounds_for_platform(  # pylint: disable=
         self,
         mock_widget: MagicMock,
         platform: str,
-        platform_api_returns: Optional[MonitorBounds],
+        platform_api_returns: MonitorBounds | None,
         fallback_returns: MonitorBounds,
         expected_bounds: MonitorBounds,
     ) -> None: