Use PEP 695 TypeVar syntax for eheimdigital (home-assistant#147154)

Author: cdce8p

homeassistant/components/eheimdigital/number.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
-from typing import Generic, TypeVar, override
+from typing import Any, override
 
 from eheimdigital.classic_vario import EheimDigitalClassicVario
 from eheimdigital.device import EheimDigitalDevice
@@ -30,16 +30,16 @@
 
 PARALLEL_UPDATES = 0
 
-_DeviceT_co = TypeVar("_DeviceT_co", bound=EheimDigitalDevice, covariant=True)
-
 
 @dataclass(frozen=True, kw_only=True)
-class EheimDigitalNumberDescription(NumberEntityDescription, Generic[_DeviceT_co]):
+class EheimDigitalNumberDescription[_DeviceT: EheimDigitalDevice](
+    NumberEntityDescription
+):
     """Class describing EHEIM Digital sensor entities."""
 
-    value_fn: Callable[[_DeviceT_co], float | None]
-    set_value_fn: Callable[[_DeviceT_co, float], Awaitable[None]]
-    uom_fn: Callable[[_DeviceT_co], str] | None = None
+    value_fn: Callable[[_DeviceT], float | None]
+    set_value_fn: Callable[[_DeviceT, float], Awaitable[None]]
+    uom_fn: Callable[[_DeviceT], str] | None = None
 
 
 CLASSICVARIO_DESCRIPTIONS: tuple[
@@ -136,7 +136,7 @@ def async_setup_device_entities(
         device_address: dict[str, EheimDigitalDevice],
     ) -> None:
         """Set up the number entities for one or multiple devices."""
-        entities: list[EheimDigitalNumber[EheimDigitalDevice]] = []
+        entities: list[EheimDigitalNumber[Any]] = []
         for device in device_address.values():
             if isinstance(device, EheimDigitalClassicVario):
                 entities.extend(
@@ -163,18 +163,18 @@ def async_setup_device_entities(
     async_setup_device_entities(coordinator.hub.devices)
 
 
-class EheimDigitalNumber(
-    EheimDigitalEntity[_DeviceT_co], NumberEntity, Generic[_DeviceT_co]
+class EheimDigitalNumber[_DeviceT: EheimDigitalDevice](
+    EheimDigitalEntity[_DeviceT], NumberEntity
 ):
     """Represent a EHEIM Digital number entity."""
 
-    entity_description: EheimDigitalNumberDescription[_DeviceT_co]
+    entity_description: EheimDigitalNumberDescription[_DeviceT]
 
     def __init__(
         self,
         coordinator: EheimDigitalUpdateCoordinator,
-        device: _DeviceT_co,
-        description: EheimDigitalNumberDescription[_DeviceT_co],
+        device: _DeviceT,
+        description: EheimDigitalNumberDescription[_DeviceT],
     ) -> None:
         """Initialize an EHEIM Digital number entity."""
         super().__init__(coordinator, device)

homeassistant/components/eheimdigital/select.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
-from typing import Generic, TypeVar, override
+from typing import Any, override
 
 from eheimdigital.classic_vario import EheimDigitalClassicVario
 from eheimdigital.device import EheimDigitalDevice
@@ -17,15 +17,15 @@
 
 PARALLEL_UPDATES = 0
 
-_DeviceT_co = TypeVar("_DeviceT_co", bound=EheimDigitalDevice, covariant=True)
-
 
 @dataclass(frozen=True, kw_only=True)
-class EheimDigitalSelectDescription(SelectEntityDescription, Generic[_DeviceT_co]):
+class EheimDigitalSelectDescription[_DeviceT: EheimDigitalDevice](
+    SelectEntityDescription
+):
     """Class describing EHEIM Digital select entities."""
 
-    value_fn: Callable[[_DeviceT_co], str | None]
-    set_value_fn: Callable[[_DeviceT_co, str], Awaitable[None]]
+    value_fn: Callable[[_DeviceT], str | None]
+    set_value_fn: Callable[[_DeviceT, str], Awaitable[None]]
 
 
 CLASSICVARIO_DESCRIPTIONS: tuple[
@@ -59,7 +59,7 @@ def async_setup_device_entities(
         device_address: dict[str, EheimDigitalDevice],
     ) -> None:
         """Set up the number entities for one or multiple devices."""
-        entities: list[EheimDigitalSelect[EheimDigitalDevice]] = []
+        entities: list[EheimDigitalSelect[Any]] = []
         for device in device_address.values():
             if isinstance(device, EheimDigitalClassicVario):
                 entities.extend(
@@ -75,18 +75,18 @@ def async_setup_device_entities(
     async_setup_device_entities(coordinator.hub.devices)
 
 
-class EheimDigitalSelect(
-    EheimDigitalEntity[_DeviceT_co], SelectEntity, Generic[_DeviceT_co]
+class EheimDigitalSelect[_DeviceT: EheimDigitalDevice](
+    EheimDigitalEntity[_DeviceT], SelectEntity
 ):
     """Represent an EHEIM Digital select entity."""
 
-    entity_description: EheimDigitalSelectDescription[_DeviceT_co]
+    entity_description: EheimDigitalSelectDescription[_DeviceT]
 
     def __init__(
         self,
         coordinator: EheimDigitalUpdateCoordinator,
-        device: _DeviceT_co,
-        description: EheimDigitalSelectDescription[_DeviceT_co],
+        device: _DeviceT,
+        description: EheimDigitalSelectDescription[_DeviceT],
     ) -> None:
         """Initialize an EHEIM Digital select entity."""
         super().__init__(coordinator, device)

homeassistant/components/eheimdigital/sensor.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Generic, TypeVar, override
+from typing import Any, override
 
 from eheimdigital.classic_vario import EheimDigitalClassicVario
 from eheimdigital.device import EheimDigitalDevice
@@ -20,14 +20,14 @@
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
 
-_DeviceT_co = TypeVar("_DeviceT_co", bound=EheimDigitalDevice, covariant=True)
-
 
 @dataclass(frozen=True, kw_only=True)
-class EheimDigitalSensorDescription(SensorEntityDescription, Generic[_DeviceT_co]):
+class EheimDigitalSensorDescription[_DeviceT: EheimDigitalDevice](
+    SensorEntityDescription
+):
     """Class describing EHEIM Digital sensor entities."""
 
-    value_fn: Callable[[_DeviceT_co], float | str | None]
+    value_fn: Callable[[_DeviceT], float | str | None]
 
 
 CLASSICVARIO_DESCRIPTIONS: tuple[
@@ -75,7 +75,7 @@ def async_setup_device_entities(
         device_address: dict[str, EheimDigitalDevice],
     ) -> None:
         """Set up the light entities for one or multiple devices."""
-        entities: list[EheimDigitalSensor[EheimDigitalDevice]] = []
+        entities: list[EheimDigitalSensor[Any]] = []
         for device in device_address.values():
             if isinstance(device, EheimDigitalClassicVario):
                 entities += [
@@ -91,18 +91,18 @@ def async_setup_device_entities(
     async_setup_device_entities(coordinator.hub.devices)
 
 
-class EheimDigitalSensor(
-    EheimDigitalEntity[_DeviceT_co], SensorEntity, Generic[_DeviceT_co]
+class EheimDigitalSensor[_DeviceT: EheimDigitalDevice](
+    EheimDigitalEntity[_DeviceT], SensorEntity
 ):
     """Represent a EHEIM Digital sensor entity."""
 
-    entity_description: EheimDigitalSensorDescription[_DeviceT_co]
+    entity_description: EheimDigitalSensorDescription[_DeviceT]
 
     def __init__(
         self,
         coordinator: EheimDigitalUpdateCoordinator,
-        device: _DeviceT_co,
-        description: EheimDigitalSensorDescription[_DeviceT_co],
+        device: _DeviceT,
+        description: EheimDigitalSensorDescription[_DeviceT],
     ) -> None:
         """Initialize an EHEIM Digital number entity."""
         super().__init__(coordinator, device)

homeassistant/components/eheimdigital/time.py

@@ -3,7 +3,7 @@
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from datetime import time
-from typing import Generic, TypeVar, final, override
+from typing import Any, final, override
 
 from eheimdigital.classic_vario import EheimDigitalClassicVario
 from eheimdigital.device import EheimDigitalDevice
@@ -19,15 +19,13 @@
 
 PARALLEL_UPDATES = 0
 
-_DeviceT_co = TypeVar("_DeviceT_co", bound=EheimDigitalDevice, covariant=True)
-
 
 @dataclass(frozen=True, kw_only=True)
-class EheimDigitalTimeDescription(TimeEntityDescription, Generic[_DeviceT_co]):
+class EheimDigitalTimeDescription[_DeviceT: EheimDigitalDevice](TimeEntityDescription):
     """Class describing EHEIM Digital time entities."""
 
-    value_fn: Callable[[_DeviceT_co], time | None]
-    set_value_fn: Callable[[_DeviceT_co, time], Awaitable[None]]
+    value_fn: Callable[[_DeviceT], time | None]
+    set_value_fn: Callable[[_DeviceT, time], Awaitable[None]]
 
 
 CLASSICVARIO_DESCRIPTIONS: tuple[
@@ -79,7 +77,7 @@ def async_setup_device_entities(
         device_address: dict[str, EheimDigitalDevice],
     ) -> None:
         """Set up the time entities for one or multiple devices."""
-        entities: list[EheimDigitalTime[EheimDigitalDevice]] = []
+        entities: list[EheimDigitalTime[Any]] = []
         for device in device_address.values():
             if isinstance(device, EheimDigitalClassicVario):
                 entities.extend(
@@ -103,18 +101,18 @@ def async_setup_device_entities(
 
 
 @final
-class EheimDigitalTime(
-    EheimDigitalEntity[_DeviceT_co], TimeEntity, Generic[_DeviceT_co]
+class EheimDigitalTime[_DeviceT: EheimDigitalDevice](
+    EheimDigitalEntity[_DeviceT], TimeEntity
 ):
     """Represent an EHEIM Digital time entity."""
 
-    entity_description: EheimDigitalTimeDescription[_DeviceT_co]
+    entity_description: EheimDigitalTimeDescription[_DeviceT]
 
     def __init__(
         self,
         coordinator: EheimDigitalUpdateCoordinator,
-        device: _DeviceT_co,
-        description: EheimDigitalTimeDescription[_DeviceT_co],
+        device: _DeviceT,
+        description: EheimDigitalTimeDescription[_DeviceT],
     ) -> None:
         """Initialize an EHEIM Digital time entity."""
         super().__init__(coordinator, device)