pybricksdev: use Python 3.10 syntax for optionals

Replace `Optional[...]` with `... | None` since we now require Python 3.10+.

Author: dlech

pybricksdev/ble/__init__.py

@@ -3,7 +3,6 @@
 
 import asyncio
 import logging
-from typing import Optional
 
 from bleak import BleakClient, BleakScanner
 from bleak.backends.device import BLEDevice
@@ -16,7 +15,7 @@
 
 
 async def find_device(
-    name: Optional[str] = None,
+    name: str | None = None,
     service: str = PYBRICKS_SERVICE_UUID,
     timeout: float = 10,
 ) -> BLEDevice:

pybricksdev/ble/lwp3/messages.py

@@ -13,7 +13,7 @@
 import abc
 import struct
 from enum import IntEnum
-from typing import Any, Dict, List, NamedTuple, Optional, Tuple, Type, Union, overload
+from typing import Any, Dict, List, NamedTuple, Tuple, Type, Union, overload
 
 from pybricksdev.ble.lwp3.bytecodes import (
     MAX_NAME_SIZE,
@@ -144,7 +144,7 @@ def __repr__(self) -> str:
 class _HubPropertyType(NamedTuple):
     type: type
     fmt: str
-    max_size: Optional[int] = None
+    max_size: int | None = None
 
 
 # specifies payload type information for each property
@@ -1500,10 +1500,10 @@ def __init__(
         self,
         port1: PortID,
         feedback1: Feedback,
-        port2: Optional[PortID] = None,
-        feedback2: Optional[Feedback] = None,
-        port3: Optional[PortID] = None,
-        feedback3: Optional[Feedback] = None,
+        port2: PortID | None = None,
+        feedback2: Feedback | None = None,
+        port3: PortID | None = None,
+        feedback3: Feedback | None = None,
     ) -> None:
         length = 5
 

pybricksdev/cli/flash.py

@@ -8,7 +8,7 @@
 import sys
 import zlib
 from tempfile import NamedTemporaryFile
-from typing import BinaryIO, Dict, Optional
+from typing import BinaryIO, Dict
 
 from bleak import BleakClient, BleakScanner
 from bleak.backends.device import BLEDevice
@@ -421,7 +421,7 @@ async def tick(callback):
         print("Done.")
 
 
-async def flash_firmware(firmware_zip: BinaryIO, new_name: Optional[str]) -> None:
+async def flash_firmware(firmware_zip: BinaryIO, new_name: str | None) -> None:
     """
     Command line tool for flashing firmware.
 

pybricksdev/compile.py

@@ -5,7 +5,7 @@
 import logging
 import os
 from modulefinder import ModuleFinder
-from typing import List, Optional, Tuple, Union
+from typing import List, Tuple, Union
 
 import mpy_cross_v5
 import mpy_cross_v6
@@ -30,7 +30,7 @@ def make_build_dir():
 
 
 async def compile_file(
-    proj_dir: str, proj_path: str, abi: int, compile_args: Optional[List[str]] = None
+    proj_dir: str, proj_path: str, abi: int, compile_args: list[str] | None = None
 ):
     """Compiles a Python file with ``mpy-cross``.
 

pybricksdev/connections/ev3.py

@@ -5,7 +5,7 @@
 import enum
 import itertools
 import struct
-from typing import Callable, Optional, Tuple
+from typing import Callable, Tuple
 
 import hid
 
@@ -75,7 +75,7 @@ def close(self) -> None:
         """
         self._device.close()
 
-    def _send_command(self, command: Command, payload: Optional[bytes] = None) -> int:
+    def _send_command(self, command: Command, payload: bytes | None = None) -> int:
         length = 4
 
         if payload is not None:
@@ -145,7 +145,7 @@ def _receive_reply(
     def download_sync(
         self,
         data: bytes,
-        progress: Optional[Callable[[int], None]] = None,
+        progress: Callable[[int], None] | None = None,
     ) -> None:
         """
         Blocking version of :meth:`download`.
@@ -169,7 +169,7 @@ def download_sync(
     async def download(
         self,
         data: bytes,
-        progress: Optional[Callable[[int], None]] = None,
+        progress: Callable[[int], None] | None = None,
     ) -> None:
         """
         Downloads a firmware blob to the EV3.

pybricksdev/connections/pybricks.py

@@ -6,7 +6,7 @@
 import logging
 import os
 import struct
-from typing import Awaitable, Callable, List, Optional, TypeVar
+from typing import Awaitable, Callable, List, TypeVar
 
 import reactivex.operators as op
 import semver
@@ -76,7 +76,7 @@ class HubPowerButtonPressedError(RuntimeError):
 class PybricksHub:
     EOL = b"\r\n"  # MicroPython EOL
 
-    fw_version: Optional[Version]
+    fw_version: Version | None
     """
     Firmware version of the connected hub or ``None`` if not connected yet.
     """
@@ -580,7 +580,7 @@ async def download(self, script_path: str) -> None:
 
     async def run(
         self,
-        py_path: Optional[str] = None,
+        py_path: str | None = None,
         wait: bool = True,
         print_output: bool = True,
         line_handler: bool = True,

pybricksdev/firmware.py

@@ -11,7 +11,7 @@
 import struct
 import sys
 import zipfile
-from typing import BinaryIO, List, Literal, Optional, Tuple, TypedDict, Union
+from typing import BinaryIO, List, Literal, Tuple, TypedDict, Union
 
 if sys.version_info < (3, 10):
     from typing_extensions import TypeGuard
@@ -127,7 +127,7 @@ def _firmware_metadata_is_v2(
 
 
 async def _create_firmware_v1(
-    metadata: AnyFirmwareV1Metadata, archive: zipfile.ZipFile, name: Optional[str]
+    metadata: AnyFirmwareV1Metadata, archive: zipfile.ZipFile, name: str | None
 ) -> bytearray:
     base = archive.open("firmware-base.bin").read()
 
@@ -189,7 +189,7 @@ async def _create_firmware_v1(
 
 
 async def _create_firmware_v2(
-    metadata: AnyFirmwareV2Metadata, archive: zipfile.ZipFile, name: Optional[str]
+    metadata: AnyFirmwareV2Metadata, archive: zipfile.ZipFile, name: str | None
 ) -> bytearray:
     base = archive.open("firmware-base.bin").read()
 
@@ -233,7 +233,7 @@ async def _create_firmware_v2(
 
 
 async def create_firmware_blob(
-    firmware_zip: Union[str, os.PathLike, BinaryIO], name: Optional[str] = None
+    firmware_zip: Union[str, os.PathLike, BinaryIO], name: str | None = None
 ) -> Tuple[bytes, AnyFirmwareMetadata, str]:
     """Creates a firmware blob from base firmware and an optional custom name.
 

pybricksdev/flash.py

@@ -7,7 +7,7 @@
 import platform
 import struct
 from collections import namedtuple
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, Tuple
 
 from tqdm.auto import tqdm
 from tqdm.contrib.logging import logging_redirect_tqdm
@@ -47,7 +47,7 @@ def __init__(
             self.reply_len += 1
         self.write_with_response = write_with_response
 
-    def make_request(self, payload: Optional[bytes] = None) -> bytearray:
+    def make_request(self, payload: bytes | None = None) -> bytearray:
         request = bytearray([self.command])
         if payload is not None:
             request += payload