Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Luftdaten traceback #19666

Merged
merged 2 commits into from Jan 1, 2019
Merged

Luftdaten traceback #19666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e7267c
Suppress traceback if there is not connection available
fabaff Dec 30, 2018
a29ca70
Remove line break
fabaff Dec 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 17 additions & 14 deletions homeassistant/components/sensor/luftdaten.py
View file
Open in desktop
Expand Up @@ -37,8 +37,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
sensors.append(
LuftdatenSensor(
luftdaten, sensor_type, name, icon, unit,
entry.data[CONF_SHOW_ON_MAP])
)
entry.data[CONF_SHOW_ON_MAP]))

async_add_entities(sensors, True)

Expand Down Expand Up @@ -67,7 +66,8 @@ def icon(self):
@property
def state(self):
"""Return the state of the device."""
return self._data[self.sensor_type]
if self._data is not None:
return self._data[self.sensor_type]

@property
def unit_of_measurement(self):
Expand All @@ -82,23 +82,26 @@ def should_poll(self):
@property
def unique_id(self) -> str:
"""Return a unique, friendly identifier for this entity."""
return '{0}_{1}'.format(self._data['sensor_id'], self.sensor_type)
if self._data is not None:
return '{0}_{1}'.format(self._data['sensor_id'], self.sensor_type)

@property
def device_state_attributes(self):
"""Return the state attributes."""
self._attrs[ATTR_SENSOR_ID] = self._data['sensor_id']
self._attrs[ATTR_ATTRIBUTION] = DEFAULT_ATTRIBUTION

on_map = ATTR_LATITUDE, ATTR_LONGITUDE
no_map = 'lat', 'long'
lat_format, lon_format = on_map if self._show_on_map else no_map
try:
self._attrs[lon_format] = self._data['longitude']
self._attrs[lat_format] = self._data['latitude']
return self._attrs
except KeyError:
return
if self._data is not None:
self._attrs[ATTR_SENSOR_ID] = self._data['sensor_id']

on_map = ATTR_LATITUDE, ATTR_LONGITUDE
no_map = 'lat', 'long'
lat_format, lon_format = on_map if self._show_on_map else no_map
try:
self._attrs[lon_format] = self._data['longitude']
self._attrs[lat_format] = self._data['latitude']
return self._attrs
except KeyError:
return

async def async_added_to_hass(self):
"""Register callbacks."""
Expand Down