From 8887c2a8afa20ed2626854e1125cd0c2f46cffb0 Mon Sep 17 00:00:00 2001 From: Johann Kellerman Date: Sat, 28 May 2016 22:56:19 +0200 Subject: [PATCH 1/3] service helper replaced with script helper --- homeassistant/components/switch/template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/switch/template.py b/homeassistant/components/switch/template.py index 68aa1c3bd69..493b54c8b9c 100644 --- a/homeassistant/components/switch/template.py +++ b/homeassistant/components/switch/template.py @@ -12,7 +12,7 @@ from homeassistant.const import ( from homeassistant.core import EVENT_STATE_CHANGED from homeassistant.exceptions import TemplateError from homeassistant.helpers.entity import generate_entity_id -from homeassistant.helpers.service import call_from_config +from homeassistant.helpers.script import call_from_config from homeassistant.helpers import template from homeassistant.util import slugify From d5f9c1bc0130439514f44635601a005b2e96c346 Mon Sep 17 00:00:00 2001 From: Johann Kellerman Date: Mon, 6 Jun 2016 06:41:29 +0200 Subject: [PATCH 2/3] Updated template switch to cache Script objects --- homeassistant/components/switch/template.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/switch/template.py b/homeassistant/components/switch/template.py index 493b54c8b9c..ada27c21d0e 100644 --- a/homeassistant/components/switch/template.py +++ b/homeassistant/components/switch/template.py @@ -12,7 +12,7 @@ from homeassistant.const import ( from homeassistant.core import EVENT_STATE_CHANGED from homeassistant.exceptions import TemplateError from homeassistant.helpers.entity import generate_entity_id -from homeassistant.helpers.script import call_from_config +from homeassistant.helpers.script import Script from homeassistant.helpers import template from homeassistant.util import slugify @@ -86,8 +86,8 @@ class SwitchTemplate(SwitchDevice): hass=hass) self._name = friendly_name self._template = state_template - self._on_action = on_action - self._off_action = off_action + self._on_script = Script(hass, on_action) + self._off_script = Script(hass, off_action) self._state = False self.update() @@ -121,11 +121,11 @@ class SwitchTemplate(SwitchDevice): def turn_on(self, **kwargs): """Fire the on action.""" - call_from_config(self.hass, self._on_action, True) + self._on_script.run(True) def turn_off(self, **kwargs): """Fire the off action.""" - call_from_config(self.hass, self._off_action, True) + self._off_script.run(True) def update(self): """Update the state from the template.""" From d1ed17e7db2feee8365d7f8cbc972f3d62f7f211 Mon Sep 17 00:00:00 2001 From: Johann Kellerman Date: Tue, 7 Jun 2016 23:00:09 +0200 Subject: [PATCH 3/3] Default parameter for .run() --- homeassistant/components/switch/template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/switch/template.py b/homeassistant/components/switch/template.py index ada27c21d0e..46900e8cc00 100644 --- a/homeassistant/components/switch/template.py +++ b/homeassistant/components/switch/template.py @@ -121,11 +121,11 @@ class SwitchTemplate(SwitchDevice): def turn_on(self, **kwargs): """Fire the on action.""" - self._on_script.run(True) + self._on_script.run() def turn_off(self, **kwargs): """Fire the off action.""" - self._off_script.run(True) + self._off_script.run() def update(self): """Update the state from the template."""