evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rfxtrx binary sensor rewrite (#10152)

Browse source 
* Refactored Lighting4-specific code (issue #8907)

* Fixed lint problem and removed unneeded function call.

* fixed malformed if

* removed backslash

* fixed code for pylint

* removed useless assignment

* using hasattr() instead of try/catch
This commit is contained in:
Yannick POLLART 2017-10-27 10:01:46 +02:00 • committed by Pascal Vizeli
parent 9df7302603
commit e819678e27
2 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
homeassistant/components/rfxtrx.py
View file

@ -245,15 +245,13 @@ def get_pt2262_cmd(device_id, data_bits):
def get_pt2262_device(device_id):
"""Look for the device which id matches the given device_id parameter."""
for dev_id, device in RFX_DEVICES.items():
try:
if device.masked_id == get_pt2262_deviceid(device_id,
device.data_bits):
_LOGGER.info("rfxtrx: found matching device %s for %s",
device_id,
get_pt2262_deviceid(device_id, device.data_bits))
return device
except AttributeError:
continue
if (hasattr(device, 'is_lighting4') and
device.masked_id == get_pt2262_deviceid(device_id,
device.data_bits)):
_LOGGER.info("rfxtrx: found matching device %s for %s",
device_id,
device.masked_id)
return device
return None
@ -261,7 +259,7 @@ def get_pt2262_device(device_id):
def find_possible_pt2262_device(device_id):
"""Look for the device which id matches the given device_id parameter."""
for dev_id, device in RFX_DEVICES.items():
if len(dev_id) == len(device_id):
if hasattr(device, 'is_lighting4') and len(dev_id) == len(device_id):
size = None
for i in range(0, len(dev_id)):
if dev_id[i] != device_id[i]: