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

Don't fail if component name is None. Fixes (#4345)

Browse source 
https://github.com/home-assistant/home-assistant/issues/4326

Might fix https://github.com/home-assistant/home-assistant/issues/4326
This commit is contained in:
Erik Eriksson 2016-11-12 23:16:27 +01:00 • committed by Paulus Schoutsen
parent 75bcb1ff0f
commit c823ea9f2a
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
homeassistant/components/sensor/tellduslive.py
View file

@ -109,7 +109,7 @@ class TelldusLiveSensor(Entity):
def name(self):
"""Return the name of the sensor."""
return "{} {}".format(self._sensor_name or DEVICE_DEFAULT_NAME,
self.quantity_name)
self.quantity_name or "")
@property
def available(self):
@ -125,6 +125,8 @@ class TelldusLiveSensor(Entity):
return self._value_as_humidity
elif self._sensor_type == SENSOR_TYPE_LUMINANCE:
return self._value_as_luminance
else:
return self._sensor_value
@property
def device_state_attributes(self):
@ -139,14 +141,17 @@ class TelldusLiveSensor(Entity):
@property
def quantity_name(self):
"""Name of quantity."""
return SENSOR_TYPES[self._sensor_type][0]
return SENSOR_TYPES[self._sensor_type][0] \
if self._sensor_type in SENSOR_TYPES else None
@property
def unit_of_measurement(self):
"""Return the unit of measurement."""
return SENSOR_TYPES[self._sensor_type][1]
return SENSOR_TYPES[self._sensor_type][1] \
if self._sensor_type in SENSOR_TYPES else None
@property
def icon(self):
"""Return the icon."""
return SENSOR_TYPES[self._sensor_type][2]
return SENSOR_TYPES[self._sensor_type][2] \
if self._sensor_type in SENSOR_TYPES else None

3
homeassistant/components/tellduslive.py
View file

@ -77,7 +77,8 @@ def request_sensors():
units = NETWORK.request('sensors/list')
# One unit can contain many sensors.
if units and 'sensor' in units:
return {unit['id']+str(sensor['name']): dict(unit, data=sensor)
return {(unit['id'], sensor['name'], sensor['scale']):
dict(unit, data=sensor)
for unit in units['sensor']
for sensor in unit['data']}
return None