pybricksdev: use Python 3.9+ generics

Replace deprecated typing Type/Dict/List/Tuple with built-in generics.

Author: dlech

pybricksdev/ble/lwp3/bytecodes.py

@@ -11,10 +11,10 @@
 """
 
 from enum import IntEnum, IntFlag, unique
-from typing import Type, Union
+from typing import Union
 
 
-def _create_pseudo_member_(cls: Type[IntEnum], value: int) -> IntEnum:
+def _create_pseudo_member_(cls: type[IntEnum], value: int) -> IntEnum:
     """
     Creates a new enum member at runtime for ``IntEnum``s.
     """

pybricksdev/ble/lwp3/messages.py

@@ -13,7 +13,7 @@
 import abc
 import struct
 from enum import IntEnum
-from typing import Any, Dict, List, NamedTuple, Tuple, Type, Union, overload
+from typing import Any, NamedTuple, Union, overload
 
 from pybricksdev.ble.lwp3.bytecodes import (
     MAX_NAME_SIZE,
@@ -861,7 +861,7 @@ def __repr__(self) -> str:
 
 
 class PortFormatSetupComboMessage(AbstractPortFormatSetupComboMessage):
-    def __init__(self, port: PortID, modes_and_datasets: List[Tuple[int, int]]) -> None:
+    def __init__(self, port: PortID, modes_and_datasets: list[tuple[int, int]]) -> None:
         super().__init__(
             5 + len(modes_and_datasets), port, PortInfoFormatSetupCommand.SET
         )
@@ -870,7 +870,7 @@ def __init__(self, port: PortID, modes_and_datasets: List[Tuple[int, int]]) -> N
             self._data[i] = ((mode & 0xF) << 4) | (dataset & 0xF)
 
     @property
-    def modes_and_datasets(self) -> List[Tuple[int, int]]:
+    def modes_and_datasets(self) -> list[tuple[int, int]]:
         return [(x >> 4, x & 0xF) for x in self._data[5:]]
 
     def __repr__(self) -> str:
@@ -923,8 +923,8 @@ def __init__(
         port: PortID,
         capabilities: ModeCapabilities,
         num_modes: int,
-        input_modes: List[int],
-        output_modes: List[int],
+        input_modes: list[int],
+        output_modes: list[int],
     ) -> None:
         super().__init__(11, port, InfoKind.MODE_INFO)
 
@@ -955,12 +955,12 @@ def num_modes(self) -> int:
         return self._data[6]
 
     @property
-    def input_modes(self) -> List[int]:
+    def input_modes(self) -> list[int]:
         (flags,) = struct.unpack_from("<H", self._data, 7)
         return [n for n in range(16) if flags & (1 << n)]
 
     @property
-    def output_modes(self) -> List[int]:
+    def output_modes(self) -> list[int]:
         (flags,) = struct.unpack_from("<H", self._data, 9)
         return [n for n in range(16) if flags & (1 << n)]
 
@@ -972,7 +972,7 @@ class PortInfoCombosMessage(AbstractPortInfoMessage):
     def __init__(
         self,
         port: PortID,
-        combos: List[List[int]],
+        combos: list[list[int]],
     ) -> None:
         super().__init__(5 + len(combos) * 2, port, InfoKind.COMBOS)
 
@@ -988,7 +988,7 @@ def __init__(
         struct.pack_into(f"<{len(flags)}H", self._data, 5, *flags)
 
     @property
-    def combos(self) -> List[List[int]]:
+    def combos(self) -> list[list[int]]:
         count = (len(self._data) - 5) // 2
         return [
             [m for m in range(16) if flags & (1 << m)]
@@ -1221,7 +1221,7 @@ def __init__(self, port: PortID, fmt: str, *values: Union[int, float]) -> None:
     def port(self) -> PortID:
         return PortID(self._data[3])
 
-    def unpack(self, fmt: str) -> Tuple[Union[int, float], ...]:
+    def unpack(self, fmt: str) -> tuple[Union[int, float], ...]:
         return struct.unpack_from(fmt, self._data, 4)
 
     def __repr__(self) -> str:
@@ -1232,7 +1232,7 @@ def __repr__(self) -> str:
 
 class PortValueComboMessage(AbstractMessage):
     def __init__(
-        self, port: PortID, modes: List[int], fmt: str, *values: Union[int, float]
+        self, port: PortID, modes: list[int], fmt: str, *values: Union[int, float]
     ) -> None:
         super().__init__(6 + struct.calcsize(fmt), MessageKind.PORT_VALUE_COMBO)
 
@@ -1249,11 +1249,11 @@ def port(self) -> PortID:
         return PortID(self._data[3])
 
     @property
-    def modes(self) -> List[int]:
+    def modes(self) -> list[int]:
         (flags,) = struct.unpack_from("<H", self._data, 4)
         return [m for m in range(16) if flags & (1 << m)]
 
-    def unpack(self, fmt: str) -> Tuple[Union[int, float], ...]:
+    def unpack(self, fmt: str) -> tuple[Union[int, float], ...]:
         return struct.unpack_from(fmt, self._data, 6)
 
     def __repr__(self) -> str:
@@ -1294,7 +1294,7 @@ def __init__(
         port: PortID,
         combo: int,
         multi_update: bool,
-        modes_and_datasets: List[int],
+        modes_and_datasets: list[int],
     ) -> None:
         super().__init__(7, MessageKind.PORT_INPUT_FMT_COMBO)
 
@@ -1321,7 +1321,7 @@ def multi_update(self) -> bool:
         return bool(self._data[4] & 0x80)
 
     @property
-    def modes_and_datasets(self) -> List[int]:
+    def modes_and_datasets(self) -> list[int]:
         (flags,) = struct.unpack_from("<H", self._data, 5)
         return [m for m in range(16) if flags & (1 << m)]
 
@@ -1467,7 +1467,7 @@ def __init__(
     def mode(self) -> int:
         return self._data[6]
 
-    def unpack(self, fmt: str) -> Tuple[Union[int, float], ...]:
+    def unpack(self, fmt: str) -> tuple[Union[int, float], ...]:
         return struct.unpack_from(fmt, self._data, 7)
 
     def __repr__(self) -> str:
@@ -1577,7 +1577,7 @@ class _Lookup(NamedTuple):
     index: int
     """The index of the bytecode that determines the type."""
 
-    value: Union[Dict[IntEnum, Type[AbstractMessage]], Dict[IntEnum, "_Lookup"]]
+    value: Union[dict[IntEnum, type[AbstractMessage]], dict[IntEnum, "_Lookup"]]
     """
     A dictionary mapping a bytecode to the cooresponding Python type if the type can be determined or
     a dictionary mapping a bytecode to another lookup if more discrimination is required.

pybricksdev/ble/pybricks.py

@@ -21,7 +21,7 @@
 
 from enum import IntEnum, IntFlag
 from struct import unpack
-from typing import Literal, Tuple
+from typing import Literal
 
 import semver
 
@@ -351,7 +351,7 @@ class UserProgramId(IntEnum):
     """
 
 
-def unpack_hub_capabilities(data: bytes) -> Tuple[int, HubCapabilityFlag, int, int]:
+def unpack_hub_capabilities(data: bytes) -> tuple[int, HubCapabilityFlag, int, int]:
     """
     Unpacks the value read from the hub capabilities characteristic.
 
@@ -373,7 +373,7 @@ def unpack_hub_capabilities(data: bytes) -> Tuple[int, HubCapabilityFlag, int, i
     return max_char_size, HubCapabilityFlag(flags), max_user_prog_size, num_of_slots
 
 
-def unpack_hub_capabilities_v15(data: bytes) -> Tuple[int, HubCapabilityFlag, int, int]:
+def unpack_hub_capabilities_v15(data: bytes) -> tuple[int, HubCapabilityFlag, int, int]:
     """
     Unpacks the value read from the hub capabilities characteristic. (Pybricks protocol v1.5)
 
@@ -459,7 +459,7 @@ def short_uuid(uuid: str) -> int:
 """
 
 
-def unpack_pnp_id(data: bytes) -> Tuple[Literal["BT", "USB"], int, int, int]:
+def unpack_pnp_id(data: bytes) -> tuple[Literal["BT", "USB"], int, int, int]:
     """
     Unpacks raw data from the PnP ID characteristic.
 

pybricksdev/cli/flash.py

@@ -8,7 +8,7 @@
 import sys
 import zlib
 from tempfile import NamedTemporaryFile
-from typing import BinaryIO, Dict
+from typing import BinaryIO
 
 from bleak import BleakClient, BleakScanner
 from bleak.backends.device import BLEDevice
@@ -273,7 +273,7 @@ async def flash_ble(hub_kind: HubKind, firmware: bytes, metadata: dict):
     # as return value from find_device_by_filter()
     # https://github.com/hbldh/bleak/issues/1277
 
-    device_adv_map: Dict[str, AdvertisementData] = {}
+    device_adv_map: dict[str, AdvertisementData] = {}
 
     def map_and_match(device: BLEDevice, adv: AdvertisementData):
         # capture the adv data for later use

pybricksdev/compile.py

@@ -5,7 +5,7 @@
 import logging
 import os
 from modulefinder import ModuleFinder
-from typing import List, Tuple, Union
+from typing import Union
 
 import mpy_cross_v5
 import mpy_cross_v6
@@ -81,7 +81,7 @@ async def compile_file(
         return mpy
 
 
-async def compile_multi_file(path: str, abi: Union[int, Tuple[int, int]]):
+async def compile_multi_file(path: str, abi: Union[int, tuple[int, int]]):
     """Compiles a Python file and its dependencies with ``mpy-cross``.
 
     On the hub, all dependencies behave as independent modules. Any (leading)
@@ -134,7 +134,7 @@ async def compile_multi_file(path: str, abi: Union[int, Tuple[int, int]]):
     logger.debug("missing modules: %r", finder.any_missing())
 
     # Get a data blob with all scripts.
-    parts: List[bytes] = []
+    parts: list[bytes] = []
 
     abi_major, abi_minor = (abi, None) if isinstance(abi, int) else abi
 

pybricksdev/connections/ev3.py

@@ -5,7 +5,7 @@
 import enum
 import itertools
 import struct
-from typing import Callable, Tuple
+from typing import Callable
 
 import hid
 
@@ -244,7 +244,7 @@ async def get_checksum(self, address: int, size: int) -> int:
             None, self.get_checksum_sync, address, size
         )
 
-    def get_version_sync(self) -> Tuple[int, int]:
+    def get_version_sync(self) -> tuple[int, int]:
         """
         Blocking version of :meth:`get_version`.
         """
@@ -257,7 +257,7 @@ def get_version_sync(self) -> Tuple[int, int]:
         payload = self._receive_reply(Command.GET_VERSION, num, force_length=13)
         return struct.unpack("<II", payload)
 
-    async def get_version(self) -> Tuple[int, int]:
+    async def get_version(self) -> tuple[int, int]:
         """
         Gets the bootloader firmware version and the hardware version.
 

pybricksdev/connections/pybricks.py

@@ -6,7 +6,7 @@
 import logging
 import os
 import struct
-from typing import Awaitable, Callable, List, TypeVar
+from typing import Awaitable, Callable, TypeVar
 
 import reactivex.operators as op
 import semver
@@ -152,7 +152,7 @@ def __init__(self):
         # REVISIT: It would be better to be able to subscribe to output instead
         # of always capturing it even if it is not used. This is currently
         # used in motor test code in pybricks-micropython.
-        self.output: List[bytes] = []
+        self.output: list[bytes] = []
         """
         Contains lines printed to stdout of the hub as a a list of bytes.
 

pybricksdev/firmware.py

@@ -11,7 +11,7 @@
 import struct
 import sys
 import zipfile
-from typing import BinaryIO, List, Literal, Tuple, TypedDict, Union
+from typing import BinaryIO, Literal, TypedDict, Union
 
 if sys.version_info < (3, 10):
     from typing_extensions import TypeGuard
@@ -33,7 +33,7 @@ class FirmwareMetadataV100(
             "device-id": Literal[0x40, 0x41, 0x80, 0x81],
             "checksum-type": Literal["sum", "crc32"],
             "mpy-abi-version": int,
-            "mpy-cross-options": List[str],
+            "mpy-cross-options": list[str],
             "user-mpy-offset": int,
             "max-firmware-size": int,
         },
@@ -234,7 +234,7 @@ async def _create_firmware_v2(
 
 async def create_firmware_blob(
     firmware_zip: Union[str, os.PathLike, BinaryIO], name: str | None = None
-) -> Tuple[bytes, AnyFirmwareMetadata, str]:
+) -> tuple[bytes, AnyFirmwareMetadata, str]:
     """Creates a firmware blob from base firmware and an optional custom name.
 
     .. note:: The firmware.zip file must contain the following files::

pybricksdev/flash.py

@@ -7,7 +7,6 @@
 import platform
 import struct
 from collections import namedtuple
-from typing import Dict, List, Tuple
 
 from tqdm.auto import tqdm
 from tqdm.contrib.logging import logging_redirect_tqdm
@@ -20,7 +19,7 @@
 
 
 # NAME, PAYLOAD_SIZE requirement
-HUB_INFO: Dict[HubKind, Tuple[str, int]] = {
+HUB_INFO: dict[HubKind, tuple[str, int]] = {
     HubKind.BOOST: ("Move Hub", 14),
     HubKind.CITY: ("City Hub", 32),
     HubKind.TECHNIC: ("Technic Hub", 32),
@@ -34,7 +33,7 @@ def __init__(
         self,
         command: BootloaderCommand,
         name: str,
-        request_format: List[str],
+        request_format: list[str],
         data_format: str,
         request_reply: bool = True,
         write_with_response: bool = True,