Remove attribute_converter support for switch

Author: TheJulianJES

tests/test_switch.py

@@ -18,7 +18,6 @@
 from zigpy.quirks.v2 import CustomDeviceV2, QuirkBuilder
 import zigpy.types as t
 from zigpy.zcl.clusters import closures, general
-from zigpy.zcl.clusters.general import OnOff
 from zigpy.zcl.clusters.manufacturer_specific import ManufacturerSpecificCluster
 import zigpy.zcl.foundation as zcl_f
 
@@ -851,52 +850,3 @@ async def test_cover_inversion_switch_not_created(zha_gateway: Gateway) -> None:
     # entity should not be created when mode or config status aren't present
     with pytest.raises(KeyError):
         get_entity(zha_device, platform=Platform.SWITCH)
-
-
-async def test_quirks_switch_attr_converter(zha_gateway: Gateway) -> None:
-    """Test ZHA quirks v2 switch with attribute_converter."""
-
-    registry = DeviceRegistry()
-    zigpy_dev = create_mock_zigpy_device(
-        zha_gateway,
-        {
-            1: {
-                SIG_EP_INPUT: [
-                    general.Basic.cluster_id,
-                    general.OnOff.cluster_id,
-                ],
-                SIG_EP_OUTPUT: [],
-                SIG_EP_TYPE: zha.DeviceType.SIMPLE_SENSOR,
-            }
-        },
-        manufacturer="manufacturer",
-        model="model",
-    )
-
-    (
-        QuirkBuilder(zigpy_dev.manufacturer, zigpy_dev.model, registry=registry)
-        .switch(
-            OnOff.AttributeDefs.on_off.name,
-            OnOff.cluster_id,
-            translation_key="on_off_quirks",
-            fallback_name="On/off",
-            attribute_converter=lambda x: not bool(x),  # invert value with lambda
-        )
-        .add_to_registry()
-    )
-
-    zigpy_device_ = registry.get_device(zigpy_dev)
-
-    assert isinstance(zigpy_device_, CustomDeviceV2)
-    cluster = zigpy_device_.endpoints[1].on_off
-
-    zha_device = await join_zigpy_device(zha_gateway, zigpy_device_)
-    entity = get_entity(zha_device, platform=Platform.SWITCH, qualifier="on_off")
-    assert entity.translation_key == "on_off_quirks"
-
-    # send updated value, check if the value is inverted
-    await send_attributes_report(zha_gateway, cluster, {"on_off": 1})
-    assert entity.state["state"] is False
-
-    await send_attributes_report(zha_gateway, cluster, {"on_off": 0})
-    assert entity.state["state"] is True

zha/application/platforms/switch.py

@@ -6,7 +6,6 @@
 from dataclasses import dataclass
 import functools
 import logging
-import typing
 from typing import TYPE_CHECKING, Any, Self, cast
 
 from zhaquirks.quirk_ids import DANFOSS_ALLY_THERMOSTAT, TUYA_PLUG_ONOFF
@@ -191,7 +190,6 @@ class ConfigurableAttributeSwitch(PlatformEntity):
 
     _attr_entity_category = EntityCategory.CONFIG
     _attribute_name: str
-    _attribute_converter: typing.Callable[[typing.Any], typing.Any] | None = None
     _inverter_attribute_name: str | None = None
     _force_inverted: bool = False
     _off_value: int = 0
@@ -245,8 +243,6 @@ def _init_from_quirks_metadata(self, entity_metadata: SwitchMetadata) -> None:
         """Init this entity from the quirks metadata."""
         super()._init_from_quirks_metadata(entity_metadata)
         self._attribute_name = entity_metadata.attribute_name
-        if entity_metadata.attribute_converter is not None:
-            self._attribute_converter = entity_metadata.attribute_converter
         if entity_metadata.invert_attribute_name:
             self._inverter_attribute_name = entity_metadata.invert_attribute_name
         if entity_metadata.force_inverted:
@@ -286,13 +282,11 @@ def inverted(self) -> bool:
     @property
     def is_on(self) -> bool:
         """Return if the switch is on based on the statemachine."""
-        raw_state = self._cluster_handler.cluster.get(self._attribute_name)
-        if self._attribute_converter:
-            val = self._attribute_converter(raw_state)
-        elif self._on_value != 1:
-            val = raw_state == self._on_value
+        if self._on_value != 1:
+            val = self._cluster_handler.cluster.get(self._attribute_name)
+            val = val == self._on_value
         else:
-            val = bool(raw_state)
+            val = bool(self._cluster_handler.cluster.get(self._attribute_name))
         return (not val) if self.inverted else val
 
     def handle_cluster_handler_attribute_updated(