Fix mypy type errors properly for zigpy 0.91.2 compatibility

Co-authored-by: puddly <32534428+puddly@users.noreply.github.com>

Author: Copilot

tests/tools/test_network_backup_restore.py

@@ -182,7 +182,8 @@ async def test_network_backup_formed(device, make_znp_server, tmp_path):
     assert backup["nwk_update_id"] == 0
     assert backup["security_level"] == 5
     assert backup["channel"] == channel
-    assert t.Channels.from_channel_list(backup["channel_mask"]) == channels  # type: ignore[misc]
+    # type: ignore[misc]
+    assert t.Channels.from_channel_list(backup["channel_mask"]) == channels
 
     assert t.KeyData(bytes.fromhex(backup["network_key"]["key"])) == network_key
     assert backup["network_key"]["sequence_number"] == 0

zigpy_znp/tools/network_restore.py

@@ -36,7 +36,8 @@ def json_backup_to_zigpy_state(
     network_info.nwk_update_id = backup["nwk_update_id"]
     network_info.nwk_manager_id = 0x0000
     network_info.channel = backup["channel"]
-    network_info.channel_mask = t.Channels.from_channel_list(backup["channel_mask"])  # type: ignore[misc]
+    # type: ignore[misc]
+    network_info.channel_mask = t.Channels.from_channel_list(backup["channel_mask"])
     network_info.security_level = backup["security_level"]
     network_info.stack_specific = backup.get("stack_specific")
     network_info.tc_link_key = zigpy.state.Key()

zigpy_znp/tools/network_scan.py

@@ -106,7 +106,8 @@ async def main(argv):
         "-c",
         "--channels",
         dest="channels",
-        type=lambda s: t.Channels.from_channel_list(map(int, s.split(","))),  # type: ignore[misc]
+        # type: ignore[misc]
+        type=lambda s: t.Channels.from_channel_list(map(int, s.split(","))),
         default=t.Channels.ALL_CHANNELS,
         help="Channels on which to scan for networks",
     )

zigpy_znp/zigbee/application.py

@@ -336,7 +336,8 @@ async def _move_network_to_channel(
             request=c.ZDO.MgmtNWKUpdateReq.Req(
                 Dst=0x0000,
                 DstAddrMode=t.AddrMode.NWK,
-                Channels=t.Channels.from_channel_list([new_channel]),  # type: ignore[misc]
+                # type: ignore[misc]
+                Channels=t.Channels.from_channel_list([new_channel]),
                 ScanDuration=zdo_t.NwkUpdate.CHANNEL_CHANGE_REQ,
                 ScanCount=0,
                 NwkManagerAddr=0x0000,

zigpy_znp/zigbee/device.py

@@ -21,8 +21,7 @@ def manufacturer(self) -> str:
 
     @manufacturer.setter
     def manufacturer(self, value: str) -> None:
-        # Setter required to match parent class interface (which has read-write properties)
-        # but intentionally does nothing since coordinator manufacturer is hardware-determined
+        # Setter for parent class interface; no-op (hardware-determined)
         pass
 
     @property
@@ -31,8 +30,7 @@ def model(self) -> str:
 
     @model.setter
     def model(self, value: str) -> None:
-        # Setter required to match parent class interface (which has read-write properties)
-        # but intentionally does nothing since coordinator model is hardware-determined
+        # Setter for parent class interface; no-op (hardware-determined)
         pass
 
     async def request(

zigpy_znp/znp/security.py

@@ -376,7 +376,7 @@ async def write_devices(
     devices: typing.Sequence[StoredDevice],
     counter_increment: t.uint32_t = 2500,
     tclk_seed: t.KeyData = None,
-) -> t.KeyData:
+) -> None:
     hashed_link_key_table = []
     aps_key_data_table = []
     link_key_table = t.APSLinkKeyTable()
@@ -446,7 +446,7 @@ async def write_devices(
 
     # Z-Stack Home 1.2 does not store keys
     if znp.version < 3.0:
-        return tclk_seed
+        return
 
     # Make sure the new table is the same size as the old table. Because this type is
     # prefixed by the number of entries, the trailing table bytes are not kept track of
@@ -506,5 +506,3 @@ async def write_devices(
             values=aps_key_data_table,
             fill_value=aps_key_data_fill_value,
         )
-
-    return tclk_seed