Switch to postponed annotation evaluation

Author: puddly

zigpy_znp/api.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 import typing
 import asyncio
@@ -26,7 +28,7 @@
 
 def _deduplicate_commands(
     commands: typing.Iterable[t.CommandBase],
-) -> typing.Tuple[t.CommandBase]:
+) -> tuple[t.CommandBase]:
     """
     Deduplicates an iterable of commands by folding more-specific commands into less-
     specific commands. Used to avoid triggering callbacks multiple times per packet.
@@ -59,7 +61,7 @@ def _deduplicate_commands(
 
 @dataclasses.dataclass(frozen=True)
 class BaseResponseListener:
-    matching_commands: typing.Tuple[t.CommandBase]
+    matching_commands: tuple[t.CommandBase]
 
     def __post_init__(self):
         commands = _deduplicate_commands(self.matching_commands)
@@ -70,7 +72,7 @@ def __post_init__(self):
         # We're frozen so __setattr__ is disallowed
         object.__setattr__(self, "matching_commands", commands)
 
-    def matching_headers(self) -> typing.Set[t.CommandHeader]:
+    def matching_headers(self) -> set[t.CommandHeader]:
         """
         Returns the set of Z-Stack MT command headers for all the matching commands.
         """

zigpy_znp/commands/zdo.py

@@ -6,7 +6,7 @@
 was received and executed. The result of the command execution will be conveyed to
 the tester via a callback message interface"""
 
-import typing
+from __future__ import annotations
 
 import zigpy.zdo.types
 
@@ -127,7 +127,7 @@ class ChildInfoList(t.LVList, item_type=t.EUI64, length_type=t.uint8_t):
 
 class NullableNodeDescriptor(zigpy.zdo.types.NodeDescriptor):
     @classmethod
-    def deserialize(cls, data: bytes) -> typing.Tuple["NullableNodeDescriptor", bytes]:
+    def deserialize(cls, data: bytes) -> tuple[NullableNodeDescriptor, bytes]:
         if data == b"\x00":
             return cls(), b""
 

zigpy_znp/frames.py

@@ -1,4 +1,5 @@
-import typing
+from __future__ import annotations
+
 import functools
 import dataclasses
 
@@ -57,7 +58,7 @@ class TransportFrame:
     payload: GeneralFrame
 
     @classmethod
-    def deserialize(cls, data: bytes) -> typing.Tuple["TransportFrame", bytes]:
+    def deserialize(cls, data: bytes) -> tuple[TransportFrame, bytes]:
         sof, data = t.uint8_t.deserialize(data)
 
         if sof != cls.SOF:

zigpy_znp/tools/common.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import typing
 import logging
 import argparse
 
 import jsonschema
 import coloredlogs
 
+import zigpy_znp.types as t
 import zigpy_znp.logger as log
 
 LOG_LEVELS = [logging.INFO, logging.DEBUG, log._TRACE]
@@ -106,7 +106,7 @@
 }
 
 
-def validate_backup_json(backup: dict[str, typing.Any]) -> None:
+def validate_backup_json(backup: t.JSONType) -> None:
     jsonschema.validate(backup, schema=OPEN_COORDINATOR_BACKUP_SCHEMA)
 
 

zigpy_znp/tools/flash_write.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import sys
-import typing
 import asyncio
 import logging
 import argparse
@@ -38,7 +39,7 @@ def compute_crc16(data: bytes) -> int:
     return crc
 
 
-def get_firmware_crcs(firmware: bytes) -> typing.Tuple[int, int]:
+def get_firmware_crcs(firmware: bytes) -> tuple[int, int]:
     # There is room for *two* CRCs in the firmware file: the expected and the computed
     firmware_without_crcs = (
         firmware[: c.ubl.IMAGE_CRC_OFFSET]

zigpy_znp/tools/network_backup.py

@@ -2,7 +2,6 @@
 
 import sys
 import json
-import typing
 import asyncio
 import logging
 import argparse
@@ -19,7 +18,7 @@
 LOGGER = logging.getLogger(__name__)
 
 
-async def backup_network(radio_path: str) -> dict[str, typing.Any]:
+async def backup_network(radio_path: str) -> t.JSONType:
     znp = ZNP(ControllerApplication.SCHEMA({"device": {"path": radio_path}}))
     await znp.connect()
 

zigpy_znp/tools/network_restore.py

@@ -2,7 +2,6 @@
 
 import sys
 import json
-import typing
 import asyncio
 import argparse
 
@@ -16,7 +15,7 @@
 
 async def restore_network(
     radio_path: str,
-    backup: dict[str, typing.Any],
+    backup: t.JSONType,
     counter_increment: int,
 ) -> None:
     pan_id, _ = t.NWK.deserialize(bytes.fromhex(backup["pan_id"])[::-1])

zigpy_znp/types/basic.py

@@ -1,15 +1,16 @@
+from __future__ import annotations
+
 import enum
-import typing
 
 from zigpy_znp.types.cstruct import CStruct
 
 
 class Bytes(bytes):
-    def serialize(self) -> "Bytes":
+    def serialize(self) -> Bytes:
         return self
 
     @classmethod
-    def deserialize(cls, data: bytes) -> typing.Tuple["Bytes", bytes]:
+    def deserialize(cls, data: bytes) -> tuple[Bytes, bytes]:
         return cls(data), b""
 
     def __repr__(self) -> str:
@@ -76,7 +77,7 @@ def serialize(self) -> bytes:
             raise ValueError(str(e)) from e
 
     @classmethod
-    def deserialize(cls, data: bytes) -> typing.Tuple["FixedIntType", bytes]:
+    def deserialize(cls, data: bytes) -> tuple[FixedIntType, bytes]:
         if len(data) < cls._size:
             raise ValueError(f"Data is too short to contain {cls._size} bytes")
 
@@ -160,11 +161,11 @@ class uint64_t(uint_t, size=8):
 class ShortBytes(Bytes):
     _header = uint8_t
 
-    def serialize(self) -> "Bytes":
+    def serialize(self) -> Bytes:
         return self._header(len(self)).serialize() + self
 
     @classmethod
-    def deserialize(cls, data: bytes) -> typing.Tuple[Bytes, bytes]:
+    def deserialize(cls, data: bytes) -> tuple[Bytes, bytes]:
         length, data = cls._header.deserialize(data)
         if length > len(data):
             raise ValueError(f"Data is too short to contain {length} bytes of data")
@@ -211,7 +212,7 @@ def serialize(self, *, align=False) -> bytes:
         )
 
     @classmethod
-    def deserialize(cls, data: bytes, *, align=False) -> typing.Tuple["LVList", bytes]:
+    def deserialize(cls, data: bytes, *, align=False) -> tuple[LVList, bytes]:
         length, data = cls._header.deserialize(data)
         r = cls()
         for i in range(length):
@@ -239,9 +240,7 @@ def serialize(self, *, align=False) -> bytes:
         return b"".join([self._serialize_item(i, align=align) for i in self])
 
     @classmethod
-    def deserialize(
-        cls, data: bytes, *, align=False
-    ) -> typing.Tuple["FixedList", bytes]:
+    def deserialize(cls, data: bytes, *, align=False) -> tuple[FixedList, bytes]:
         r = cls()
         for i in range(cls._length):
             item, data = cls._deserialize_item(data, align=align)
@@ -258,9 +257,7 @@ def serialize(self, *, align=False) -> bytes:
         return b"".join([self._serialize_item(i, align=align) for i in self])
 
     @classmethod
-    def deserialize(
-        cls, data: bytes, *, align=False
-    ) -> typing.Tuple["CompleteList", bytes]:
+    def deserialize(cls, data: bytes, *, align=False) -> tuple[CompleteList, bytes]:
         r = cls()
         while data:
             item, data = cls._deserialize_item(data, align=align)

zigpy_znp/types/commands.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import enum
-import typing
 import logging
 import dataclasses
 
@@ -151,8 +152,8 @@ def __str__(self) -> str:
 class CommandDef:
     command_type: CommandType
     command_id: t.uint8_t
-    req_schema: typing.Optional[tuple] = None
-    rsp_schema: typing.Optional[tuple] = None
+    req_schema: tuple | None = None
+    rsp_schema: tuple | None = None
 
 
 class CommandsMeta(type):