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

Removed decorator callback

Browse source 
The decorator callback was not actually necessary so it was removed and
replaced with a partial function instead.
This commit is contained in:
Ryan Kraus 2016-01-25 00:14:16 -05:00
parent bcdfc555e0
commit 8406f81811
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
homeassistant/helpers/event_decorators.py
View file

@ -7,18 +7,13 @@ from homeassistant.helpers import event
HASS = None HASS = None
def _callback(action, *args, **kwargs):
""" adds HASS to callback arguments """
action(HASS, *args, **kwargs)
def track_state_change(entity_ids, from_state=None, to_state=None): def track_state_change(entity_ids, from_state=None, to_state=None):
""" Decorator factory to track state changes for entity id """ """ Decorator factory to track state changes for entity id """
def track_state_change_decorator(action): def track_state_change_decorator(action):
""" Decorator to track state changes """ """ Decorator to track state changes """
event.track_state_change(HASS, entity_ids, event.track_state_change(HASS, entity_ids,
functools.partial(_callback, action), functools.partial(action, HASS),
from_state, to_state) from_state, to_state)
return action return action
@ -31,7 +26,7 @@ def track_sunrise(offset=None):
def track_sunrise_decorator(action): def track_sunrise_decorator(action):
""" Decorator to track sunrise events """ """ Decorator to track sunrise events """
event.track_sunrise(HASS, event.track_sunrise(HASS,
functools.partial(_callback, action), functools.partial(action, HASS),
offset) offset)
return action return action
@ -44,7 +39,7 @@ def track_sunset(offset=None):
def track_sunset_decorator(action): def track_sunset_decorator(action):
""" Decorator to track sunset events """ """ Decorator to track sunset events """
event.track_sunset(HASS, event.track_sunset(HASS,
functools.partial(_callback, action), functools.partial(action, HASS),
offset) offset)
return action return action
@ -59,7 +54,7 @@ def track_time_change(year=None, month=None, day=None, hour=None, minute=None,
def track_time_change_decorator(action): def track_time_change_decorator(action):
""" Decorator to track time changes """ """ Decorator to track time changes """
event.track_time_change(HASS, event.track_time_change(HASS,
functools.partial(_callback, action), functools.partial(action, HASS),
year, month, day, hour, minute, second) year, month, day, hour, minute, second)
return action return action
@ -74,7 +69,7 @@ def track_utc_time_change(year=None, month=None, day=None, hour=None,
def track_utc_time_change_decorator(action): def track_utc_time_change_decorator(action):
""" Decorator to track time changes """ """ Decorator to track time changes """
event.track_utc_time_change(HASS, event.track_utc_time_change(HASS,
functools.partial(_callback, action), functools.partial(action, HASS),
year, month, day, hour, minute, second) year, month, day, hour, minute, second)
return action return action

7
homeassistant/helpers/service.py
View file

@ -15,18 +15,13 @@ CONF_SERVICE_DATA = 'data'
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
def _callback(action, *args, **kwargs):
""" adds HASS to callback arguments """
action(HASS, *args, **kwargs)
def service(domain, service_name): def service(domain, service_name):
""" Decorator factory to register a service """ """ Decorator factory to register a service """
def register_service_decorator(action): def register_service_decorator(action):
""" Decorator to register a service """ """ Decorator to register a service """
HASS.services.register(domain, service_name, HASS.services.register(domain, service_name,
functools.partial(_callback, action)) functools.partial(action, HASS))
return action return action
return register_service_decorator return register_service_decorator