Fix Hass 2024.1 error: RecursionError #1285

AlexxIT · Jan 4, 2024 · 85f77fe · 85f77fe
1 parent ab1af1a
commit 85f77fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/custom_components/sonoff/core/devices.py b/custom_components/sonoff/core/devices.py
@@ -87,7 +87,7 @@ def spec(cls, base: str = None, enabled: bool = None, **kwargs) -> type:
         bases = cls.__mro__[-len(XSwitch.__mro__) :: -1]
         bases = {k: v for b in bases for k, v in b.__dict__.items()}
         return type(cls.__name__, DEVICE_CLASS[base], {**bases, **kwargs})
-    return type(cls.__name__, (cls,), {**cls.__dict__, **kwargs})
+    return type(cls.__name__, (cls,), kwargs)
 
 
 Switch1 = spec(XSwitches, channel=0, uid="1")

diff --git a/tests/test_backward.py b/tests/test_backward.py
@@ -15,6 +15,9 @@
     UnitOfPower,
     UnitOfTemperature,
 )
+from homeassistant.helpers.entity import Entity
+
+from . import init
 
 
 def test_2021_9_0():
@@ -51,4 +54,10 @@ def test_2023_1_0():
 
 
 def test_2024_1_cached_properties():
-    pass
+    _, entities = init({"extra": {"uiid": 5}})
+    sensor: SensorEntity = next(e for e in entities if e.uid == "energy")
+    assert sensor.device_class == SensorDeviceClass.ENERGY
+
+    _, entities = init({"extra": {"uiid": 1256}})
+    sensor: Entity = next(e for e in entities)
+    assert sensor.should_poll is False