Revert "Fixing Issue #52 changed a couple of more places that might trigger undefined index with deConz"

This reverts commit 5553adb.

Author: benknight

logic/action.py

@@ -45,7 +45,7 @@ def _shuffle_group(self, group_id):
         lids = utils.get_group_lids(group_id)
 
         # Only shuffle the lights that are on
-        on_lids = [lid for lid in lids if 'state' in lights[lid] and 'on' in lights[lid]['state'] and lights[lid]['state']['on']]
+        on_lids = [lid for lid in lids if lights[lid]['state']['on']]
         on_xy = [lights[lid]['state']['xy'] for lid in on_lids]
         shuffled = list(on_xy)
 
@@ -60,7 +60,7 @@ def _set_harmony(self, group_id, mode, root):
         lids = utils.get_group_lids(group_id)
         palette = []
 
-        on_lids = [lid for lid in lids if 'state' in lights[lid] and 'on' in lights[lid]['state'] and lights[lid]['state']['on']]
+        on_lids = [lid for lid in lids if lights[lid]['state']['on']]
         args = (len(on_lids), '#%s' % utils.get_color_value(root))
         harmony_colors = getattr(harmony, mode)(*args)
 

logic/filters.py

@@ -221,7 +221,7 @@ class HueActionFilter(HueFilterBase):
 
     def get_items(self, query, id, type, resource):
         control = query.split(':')
-        is_on = (type == self.LIGHT_TYPE and 'state' in resource and 'on' in resource['state'] and resource['state']['on'])
+        is_on = (type == self.LIGHT_TYPE and resource['state']['on'])
         name = resource['name'] if resource else 'All lights'
 
         if type == self.LIGHT_TYPE: