From 3b89102338bfd8c7576d5d37a97a51f4bc101c2d Mon Sep 17 00:00:00 2001 From: Ryan Kraus Date: Sun, 24 Jan 2016 23:00:43 -0500 Subject: [PATCH] Fixed lint issue from merge extract_entity_ids from the service helpers was overwriting the service decorator with one of its attributes. This was fixed. --- homeassistant/helpers/service.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py index ccab891eedb..6617d0e1514 100644 --- a/homeassistant/helpers/service.py +++ b/homeassistant/helpers/service.py @@ -64,18 +64,18 @@ def call_from_config(hass, config, blocking=False): hass.services.call(domain, service_name, service_data, blocking) -def extract_entity_ids(hass, service): +def extract_entity_ids(hass, service_call): """ Helper method to extract a list of entity ids from a service call. Will convert group entity ids to the entity ids it represents. """ - if not (service.data and ATTR_ENTITY_ID in service.data): + if not (service_call.data and ATTR_ENTITY_ID in service_call.data): return [] group = get_component('group') # Entity ID attr can be a list or a string - service_ent_id = service.data[ATTR_ENTITY_ID] + service_ent_id = service_call.data[ATTR_ENTITY_ID] if isinstance(service_ent_id, str): return group.expand_entity_ids(hass, [service_ent_id])