Fix breakage caused by ABCCachedProperties metaclass on Entity

Fixes: nathanmarlor#480
canton7 · Jan 2, 2024 · 0bb6cce · 0bb6cce
1 parent ff5b2c0
commit 0bb6cce
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/custom_components/foxess_modbus/entities/modbus_entity_mixin.py b/custom_components/foxess_modbus/entities/modbus_entity_mixin.py
@@ -73,8 +73,22 @@ class ModbusEntityProtocol(Protocol):
 else:
     _ModbusEntityMixinBase = object
 
+# HA introduced a ABCCachedProperties metaclass which is used by Entity, and which derives from ABCMeta.
+# This conflicts with Protocol's metaclass (from ModbusEntityProtocol).
+if type(Entity) == type(type):  # type: ignore
+    _METACLASS = type(Protocol)  # Inherits from ABCMeta
 
-class ModbusEntityMixin(ModbusControllerEntity, ModbusEntityProtocol, _ModbusEntityMixinBase):
+else:
+
+    class ModbusEntityMixinMetaclass(type(Entity), type(Protocol)):  # type: ignore
+        pass
+
+    _METACLASS = ModbusEntityMixinMetaclass
+
+
+class ModbusEntityMixin(
+    ModbusControllerEntity, ModbusEntityProtocol, _ModbusEntityMixinBase, metaclass=_METACLASS  # type: ignore
+):
     """
     Mixin for subclasses of Entity