From ced380f0cda0566110c6e89eeeba84dcff71dbea Mon Sep 17 00:00:00 2001 From: pavoni Date: Thu, 4 Feb 2016 17:24:38 +0000 Subject: [PATCH] Remove unneeded entity_id check and blank lines. --- homeassistant/components/sensor/template.py | 5 +---- homeassistant/components/switch/template.py | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/sensor/template.py b/homeassistant/components/sensor/template.py index b87e26aa415..6ed4a0256e5 100644 --- a/homeassistant/components/sensor/template.py +++ b/homeassistant/components/sensor/template.py @@ -94,10 +94,7 @@ class SensorTemplate(Entity): def _update_callback(_event): """ Called when the target device changes state. """ - # This can be called before the entity is properly - # initialised, so check before updating state, - if self.entity_id: - self.update_ha_state(True) + self.update_ha_state(True) self.hass.bus.listen(EVENT_STATE_CHANGED, _update_callback) diff --git a/homeassistant/components/switch/template.py b/homeassistant/components/switch/template.py index 34524978c84..12a53ccbcc2 100644 --- a/homeassistant/components/switch/template.py +++ b/homeassistant/components/switch/template.py @@ -20,11 +20,8 @@ from homeassistant.const import ( CONF_VALUE_TEMPLATE) from homeassistant.helpers.service import call_from_config - from homeassistant.util import template, slugify - from homeassistant.exceptions import TemplateError - from homeassistant.components.switch import DOMAIN ENTITY_ID_FORMAT = DOMAIN + '.{}' @@ -117,10 +114,7 @@ class SwitchTemplate(SwitchDevice): def _update_callback(_event): """ Called when the target device changes state. """ - # This can be called before the entity is properly - # initialised, so check before updating state, - if self.entity_id: - self.update_ha_state(True) + self.update_ha_state(True) self.hass.bus.listen(EVENT_STATE_CHANGED, _update_callback)