Update merging_manager.py

azerty9971 · Jan 26, 2025 · 05abc39 · 05abc39
1 parent 66379b0
commit 05abc39
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/custom_components/xtend_tuya/multi_manager/shared/merging_manager.py b/custom_components/xtend_tuya/multi_manager/shared/merging_manager.py
@@ -247,7 +247,10 @@ def smart_merge(left: any, right: any, msg_queue: list[str] | None = None, path:
             if left is not None:
                 return left
             return right
-        if type(left) != type(right):
+        if (
+            type(left) is not type(right) 
+            and not (isinstance(left, str) and isinstance(right, str)) #Used to prevent warning on classes that represent a string (DPType and TuyaDPType)
+            ):
             if msg_queue is not None:
                 msg_queue.append(f"Merging tried to merge objects of different types: {type(left)} and {type(right)}, returning left ({path})")
             return left