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

Use pass instead of return None (#3856)

Browse Source
This commit is contained in:
John Arild Berentsen 2016-10-14 09:09:24 +02:00 committed by Paulus Schoutsen
parent a5b756e1e5
commit 6ca0d4cd14
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/climate/__init__.py
View File

@ -368,7 +368,10 @@ class ClimateDevice(Entity):
@property @property
def state(self): def state(self):
"""Return the current state.""" """Return the current state."""
return self.current_operation or STATE_UNKNOWN if self.current_operation:
return self.current_operation
else:
return STATE_UNKNOWN
@property @property
def state_attributes(self): def state_attributes(self):
@ -398,17 +401,20 @@ class ClimateDevice(Entity):
fan_mode = self.current_fan_mode fan_mode = self.current_fan_mode
if fan_mode is not None: if fan_mode is not None:
data[ATTR_FAN_MODE] = fan_mode data[ATTR_FAN_MODE] = fan_mode
data[ATTR_FAN_LIST] = self.fan_list if self.fan_list:
data[ATTR_FAN_LIST] = self.fan_list
operation_mode = self.current_operation operation_mode = self.current_operation
if operation_mode is not None: if operation_mode is not None:
data[ATTR_OPERATION_MODE] = operation_mode data[ATTR_OPERATION_MODE] = operation_mode
data[ATTR_OPERATION_LIST] = self.operation_list if self.operation_list:
data[ATTR_OPERATION_LIST] = self.operation_list
swing_mode = self.current_swing_mode swing_mode = self.current_swing_mode
if swing_mode is not None: if swing_mode is not None:
data[ATTR_SWING_MODE] = swing_mode data[ATTR_SWING_MODE] = swing_mode
data[ATTR_SWING_LIST] = self.swing_list if self.swing_list:
data[ATTR_SWING_LIST] = self.swing_list
is_away = self.is_away_mode_on is_away = self.is_away_mode_on
if is_away is not None: if is_away is not None: