Remove entity description mixin in V2C (#112960)

homeassistant/components/v2c/binary_sensor.py

@@ -21,20 +21,13 @@ from .coordinator import V2CUpdateCoordinator
 from .entity import V2CBaseEntity
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
-class V2CRequiredKeysMixin:
+class V2CBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Mixin for required keys."""
+    """Describes an EVSE binary sensor entity."""
 
     value_fn: Callable[[Trydan], bool]
 
 
-@dataclass(frozen=True)
-class V2CBinarySensorEntityDescription(
-    BinarySensorEntityDescription, V2CRequiredKeysMixin
-):
-    """Describes an EVSE binary sensor entity."""
-
-
 TRYDAN_SENSORS = (
     V2CBinarySensorEntityDescription(
         key="connected",

homeassistant/components/v2c/number.py

@@ -25,21 +25,14 @@ MIN_INTENSITY = 6
 MAX_INTENSITY = 32
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
-class V2CSettingsRequiredKeysMixin:
+class V2CSettingsNumberEntityDescription(NumberEntityDescription):
-    """Mixin for required keys."""
+    """Describes V2C EVSE number entity."""
 
     value_fn: Callable[[TrydanData], int]
     update_fn: Callable[[Trydan, int], Coroutine[Any, Any, None]]
 
 
-@dataclass(frozen=True)
-class V2CSettingsNumberEntityDescription(
-    NumberEntityDescription, V2CSettingsRequiredKeysMixin
-):
-    """Describes V2C EVSE number entity."""
-
-
 TRYDAN_NUMBER_SETTINGS = (
     V2CSettingsNumberEntityDescription(
         key="intensity",

homeassistant/components/v2c/sensor.py

@@ -26,18 +26,13 @@ from .entity import V2CBaseEntity
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
-class V2CRequiredKeysMixin:
+class V2CSensorEntityDescription(SensorEntityDescription):
-    """Mixin for required keys."""
+    """Describes an EVSE Power sensor entity."""
 
     value_fn: Callable[[TrydanData], float]
 
 
-@dataclass(frozen=True)
-class V2CSensorEntityDescription(SensorEntityDescription, V2CRequiredKeysMixin):
-    """Describes an EVSE Power sensor entity."""
-
-
 TRYDAN_SENSORS = (
     V2CSensorEntityDescription(
         key="charge_power",

homeassistant/components/v2c/switch.py

@@ -28,20 +28,15 @@ from .entity import V2CBaseEntity
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
-class V2CRequiredKeysMixin:
+class V2CSwitchEntityDescription(SwitchEntityDescription):
-    """Mixin for required keys."""
+    """Describes a V2C EVSE switch entity."""
 
     value_fn: Callable[[TrydanData], bool]
     turn_on_fn: Callable[[Trydan], Coroutine[Any, Any, Any]]
     turn_off_fn: Callable[[Trydan], Coroutine[Any, Any, Any]]
 
 
-@dataclass(frozen=True)
-class V2CSwitchEntityDescription(SwitchEntityDescription, V2CRequiredKeysMixin):
-    """Describes a V2C EVSE switch entity."""
-
-
 TRYDAN_SWITCHES = (
     V2CSwitchEntityDescription(
         key="paused",