refactor: Migrate to typing.Self and remove __future__ annotations.

Author: allenporter

roborock/broadcast_protocol.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import asyncio
 import hashlib
 import json

roborock/data/code_mappings.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from collections import namedtuple
 from enum import Enum, IntEnum, StrEnum
@@ -17,7 +15,7 @@ def name(self) -> str:
         return super().name.lower()
 
     @classmethod
-    def _missing_(cls: type[RoborockEnum], key) -> RoborockEnum:
+    def _missing_(cls: type[Self], key) -> Self:
         if hasattr(cls, "unknown"):
             warning = f"Missing {cls.__name__} code: {key} - defaulting to 'unknown'"
             if warning not in completed_warnings:
@@ -32,23 +30,23 @@ def _missing_(cls: type[RoborockEnum], key) -> RoborockEnum:
         return default_value
 
     @classmethod
-    def as_dict(cls: type[RoborockEnum]):
+    def as_dict(cls: type[Self]):
         return {i.name: i.value for i in cls if i.name != "missing"}
 
     @classmethod
-    def as_enum_dict(cls: type[RoborockEnum]):
+    def as_enum_dict(cls: type[Self]):
         return {i.value: i for i in cls if i.name != "missing"}
 
     @classmethod
-    def values(cls: type[RoborockEnum]) -> list[int]:
+    def values(cls: type[Self]) -> list[int]:
         return list(cls.as_dict().values())
 
     @classmethod
-    def keys(cls: type[RoborockEnum]) -> list[str]:
+    def keys(cls: type[Self]) -> list[str]:
         return list(cls.as_dict().keys())
 
     @classmethod
-    def items(cls: type[RoborockEnum]):
+    def items(cls: type[Self]):
         return cls.as_dict().items()
 
 

roborock/data/v1/v1_code_mappings.py

@@ -1,3 +1,5 @@
+from typing import Self
+
 from ..code_mappings import RoborockEnum
 
 
@@ -91,7 +93,7 @@ class RoborockStartType(RoborockEnum):
 
 class RoborockDssCodes(RoborockEnum):
     @classmethod
-    def _missing_(cls: type[RoborockEnum], key) -> RoborockEnum:
+    def _missing_(cls: type[Self], key) -> Self:
         # If the calculated value is not provided, then it should be viewed as okay.
         # As the math will sometimes result in you getting numbers that don't matter.
         return cls.okay  # type: ignore

roborock/devices/rpc/b01_q10_channel.py

@@ -1,7 +1,5 @@
 """Thin wrapper around the MQTT channel for Roborock B01 Q10 devices."""
 
-from __future__ import annotations
-
 import logging
 from collections.abc import AsyncGenerator
 from typing import Any

roborock/devices/traits/b01/q7/clean_summary.py

@@ -4,8 +4,6 @@
 and a `record_list` whose items contain a JSON string in `detail`.
 """
 
-from __future__ import annotations
-
 import logging
 
 from roborock import CleanRecordDetail, CleanRecordList, CleanRecordSummary

roborock/devices/traits/v1/network_info.py

@@ -1,7 +1,5 @@
 """Trait for device network information."""
 
-from __future__ import annotations
-
 import logging
 
 from roborock.data import NetworkInfo

roborock/diagnostics.py

@@ -9,8 +9,6 @@
 DeviceManager.
 """
 
-from __future__ import annotations
-
 import time
 from collections import Counter
 from collections.abc import Generator, Mapping
@@ -49,7 +47,7 @@ def as_dict(self) -> Mapping[str, Any]:
             data[k] = v
         return data
 
-    def subkey(self, key: str) -> Diagnostics:
+    def subkey(self, key: str) -> "Diagnostics":
         """Return sub-Diagnostics object with the specified subkey.
 
         This will create a new Diagnostics object if one does not already exist

roborock/exceptions.py

@@ -1,7 +1,5 @@
 """Roborock exceptions."""
 
-from __future__ import annotations
-
 
 class RoborockException(Exception):
     """Class for Roborock exceptions."""

roborock/protocol.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import binascii
 import gzip
 import hashlib

roborock/roborock_message.py

@@ -1,7 +1,6 @@
-from __future__ import annotations
-
 from dataclasses import dataclass, field
 from enum import StrEnum
+from typing import Self
 
 from roborock import RoborockEnum
 from roborock.util import get_next_int, get_timestamp
@@ -37,7 +36,7 @@ class RoborockDataProtocol(RoborockEnum):
     OFFLINE_STATUS = 135
 
     @classmethod
-    def _missing_(cls: type[RoborockEnum], key) -> RoborockEnum:
+    def _missing_(cls: type[Self], key) -> Self:
         raise ValueError("%s not a valid key for Data Protocol", key)