jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect for unknown state attributes. (#31354)

Browse Source
This commit is contained in:
ochlocracy 2020-01-31 17:14:43 -05:00 committed by Paulus Schoutsen
parent 7ee741d424
commit f26cb83fd5
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
homeassistant/components/alexa/capabilities.py
View File

@ -1326,14 +1326,20 @@ class AlexaRangeController(AlexaCapability):
if name != "rangeValue": if name != "rangeValue":
raise UnsupportedProperty(name) raise UnsupportedProperty(name)
# Return None for unavailable and unknown states.
# Allows the Alexa.EndpointHealth Interface to handle the unavailable state in a stateReport.
if self.entity.state in (STATE_UNAVAILABLE, STATE_UNKNOWN, None):
return None
# Fan Speed # Fan Speed
if self.instance == f"{fan.DOMAIN}.{fan.ATTR_SPEED}": if self.instance == f"{fan.DOMAIN}.{fan.ATTR_SPEED}":
speed_list = self.entity.attributes[fan.ATTR_SPEED_LIST] speed_list = self.entity.attributes.get(fan.ATTR_SPEED_LIST)
speed = self.entity.attributes[fan.ATTR_SPEED] speed = self.entity.attributes.get(fan.ATTR_SPEED)
speed_index = next( if speed_list is not None and speed is not None:
(i for i, v in enumerate(speed_list) if v == speed), None speed_index = next(
) (i for i, v in enumerate(speed_list) if v == speed), None
return speed_index )
return speed_index
# Cover Position # Cover Position
if self.instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}": if self.instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
@ -1349,12 +1355,13 @@ class AlexaRangeController(AlexaCapability):
# Vacuum Fan Speed # Vacuum Fan Speed
if self.instance == f"{vacuum.DOMAIN}.{vacuum.ATTR_FAN_SPEED}": if self.instance == f"{vacuum.DOMAIN}.{vacuum.ATTR_FAN_SPEED}":
speed_list = self.entity.attributes[vacuum.ATTR_FAN_SPEED_LIST] speed_list = self.entity.attributes.get(vacuum.ATTR_FAN_SPEED_LIST)
speed = self.entity.attributes[vacuum.ATTR_FAN_SPEED] speed = self.entity.attributes.get(vacuum.ATTR_FAN_SPEED)
speed_index = next( if speed_list is not None and speed is not None:
(i for i, v in enumerate(speed_list) if v == speed), None speed_index = next(
) (i for i, v in enumerate(speed_list) if v == speed), None
return speed_index )
return speed_index
return None return None