refactor is_manufacturer_specific_cluster, and fix an issue as it mig…

…ht return None
zigbeefordomoticz · Nov 22, 2023 · 5e2450a · 5e2450a
1 parent 96b54ec
commit 5e2450a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/Modules/readZclClusters.py b/Modules/readZclClusters.py
@@ -318,12 +318,8 @@ def is_cluster_zcl_config_available( self, nwkid, ep, cluster, attribute=None):
 
 def is_manufacturer_specific_cluster( self, cluster):
 
-    if cluster not in self.readZclClusters:
-        return False
-    if "ManufSpecificCluster" in self.readZclClusters[ cluster ]:
-        # We have a Manufacturer Specific cluster
-        return True
-
+    return bool(self.readZclClusters.get(cluster, {}).get("ManufSpecificCluster", False))
+
 
 def is_generic_zcl_cluster( self, cluster, attribute=None):
     if cluster not in self.readZclClusters: