Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Point-fix zwave getter not to ignore label (#5938)

pull/6009/head
Andrey 2017-02-14 21:59:34 +02:00 committed by Paulus Schoutsen
parent 7401ec96b5
commit 67d35e6454
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/zwave/__init__.py
View File

@ -638,7 +638,6 @@ class ZWaveDeviceEntity(Entity):
def _value_handler(self, method=None, class_id=None, index=None,
label=None, data=None, member=None, **kwargs):
"""Get the values for a given command_class with arguments."""
varname = member
if class_id is not None:
kwargs[CLASS_ID] = class_id
_LOGGER.debug('method=%s, class_id=%s, index=%s, label=%s, data=%s,'
@ -653,16 +652,20 @@ class ZWaveDeviceEntity(Entity):
if index is not None and value.index != index:
continue
if label is not None:
label_found = False
for entry in label:
if entry is not None and value.label != entry:
continue
if value.label == entry:
label_found = True
break
if not label_found:
continue
if method == 'set':
value.data = data
return
if data is not None and value.data != data:
continue
if member is not None:
results = getattr(value, varname)
results = getattr(value, member)
else:
results = value
break