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

make attributes in the fritzdect module easier to process (#8436)

Browse Source 
* make attributes in the fritzdect module easier to process
* remove spaces in attribute names
* move units to separate attributes

* make attributes in the fritzdect module easier to process
* remove spaces in attribute names
* move units to separate attributes

* Use new python formating syntax and attribute constant

* Shorten too long line

* Fix indent
This commit is contained in:
Thomas Klingbeil 2017-07-22 20:34:58 +02:00 committed by Fabian Affolter
parent 2f08a91fdd
commit 9043895407
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
homeassistant/components/switch/fritzdect.py
View File

@ -12,7 +12,7 @@ from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
from homeassistant.const import ( from homeassistant.const import (
CONF_HOST, CONF_PASSWORD, CONF_USERNAME) CONF_HOST, CONF_PASSWORD, CONF_USERNAME)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.const import TEMP_CELSIUS, STATE_UNKNOWN from homeassistant.const import TEMP_CELSIUS, ATTR_TEMPERATURE, STATE_UNKNOWN
REQUIREMENTS = ['fritzhome==1.0.2'] REQUIREMENTS = ['fritzhome==1.0.2']
@ -21,13 +21,15 @@ _LOGGER = logging.getLogger(__name__)
# Standard Fritz Box IP # Standard Fritz Box IP
DEFAULT_HOST = 'fritz.box' DEFAULT_HOST = 'fritz.box'
ATTR_CURRENT_CONSUMPTION = 'Current Consumption' ATTR_CURRENT_CONSUMPTION = 'current_consumption'
ATTR_CURRENT_CONSUMPTION_UNIT = 'W' ATTR_CURRENT_CONSUMPTION_UNIT = 'current_consumption_unit'
ATTR_CURRENT_CONSUMPTION_UNIT_VALUE = 'W'
ATTR_TOTAL_CONSUMPTION = 'Total Consumption' ATTR_TOTAL_CONSUMPTION = 'total_consumption'
ATTR_TOTAL_CONSUMPTION_UNIT = 'kWh' ATTR_TOTAL_CONSUMPTION_UNIT = 'total_consumption_unit'
ATTR_TOTAL_CONSUMPTION_UNIT_VALUE = 'kWh'
ATTR_TEMPERATURE = 'Temperature' ATTR_TEMPERATURE_UNIT = 'temperature_unit'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string, vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
@ -86,17 +88,21 @@ class FritzDectSwitch(SwitchDevice):
if self.data.has_powermeter and \ if self.data.has_powermeter and \
self.data.current_consumption != STATE_UNKNOWN and \ self.data.current_consumption != STATE_UNKNOWN and \
self.data.total_consumption != STATE_UNKNOWN: self.data.total_consumption != STATE_UNKNOWN:
attrs[ATTR_CURRENT_CONSUMPTION] = "%.1f %s" % \ attrs[ATTR_CURRENT_CONSUMPTION] = "{:.1f}".format(
(self.data.current_consumption, ATTR_CURRENT_CONSUMPTION_UNIT) self.data.current_consumption)
attrs[ATTR_TOTAL_CONSUMPTION] = "%.3f %s" % \ attrs[ATTR_CURRENT_CONSUMPTION_UNIT] = "{}".format(
(self.data.total_consumption, ATTR_TOTAL_CONSUMPTION_UNIT) ATTR_CURRENT_CONSUMPTION_UNIT_VALUE)
attrs[ATTR_TOTAL_CONSUMPTION] = "{:.3f}".format(
self.data.total_consumption)
attrs[ATTR_TOTAL_CONSUMPTION_UNIT] = "{}".format(
ATTR_TOTAL_CONSUMPTION_UNIT_VALUE)
if self.data.has_temperature and \ if self.data.has_temperature and \
self.data.temperature != STATE_UNKNOWN: self.data.temperature != STATE_UNKNOWN:
attrs[ATTR_TEMPERATURE] = "%.1f %s" % \ attrs[ATTR_TEMPERATURE] = "{}".format(
(self.units.temperature(self.data.temperature, TEMP_CELSIUS), self.units.temperature(self.data.temperature, TEMP_CELSIUS))
self.units.temperature_unit) attrs[ATTR_TEMPERATURE_UNIT] = "{}".format(
self.units.temperature_unit)
return attrs return attrs
@property @property