From 0f6ec9b7ac3227f21e07f11bf05980872fce9a73 Mon Sep 17 00:00:00 2001 From: sander Date: Sun, 28 Feb 2016 21:00:51 +0100 Subject: [PATCH] Added your suggestions. Looking at your code suggestion below I am not sure exactly how other people might want to put in lists. (But I am missing a more general overview of the code) ``` if not isinstance(scene_config,list): scene_config=[scene_config] ``` But it is there ! And changed "config" to "states" ! --- homeassistant/components/scene/__init__.py | 2 +- homeassistant/components/scene/homeassistant.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/scene/__init__.py b/homeassistant/components/scene/__init__.py index fbf8ab77230..ee6f9b1bd5d 100644 --- a/homeassistant/components/scene/__init__.py +++ b/homeassistant/components/scene/__init__.py @@ -48,7 +48,7 @@ def setup(hass, config): platform_config = [platform_config] if not any(CONF_PLATFORM in entry for entry in platform_config): - platform_config = [{'platform': 'homeassistant', 'config': entry} + platform_config = [{'platform': 'homeassistant', 'states': entry} for entry in platform_config] config[config_key] = platform_config diff --git a/homeassistant/components/scene/homeassistant.py b/homeassistant/components/scene/homeassistant.py index bb6f3a263e7..0d6c2191133 100644 --- a/homeassistant/components/scene/homeassistant.py +++ b/homeassistant/components/scene/homeassistant.py @@ -25,9 +25,13 @@ SceneConfig = namedtuple('SceneConfig', ['name', 'states']) # pylint: disable=unused-argument def setup_platform(hass, config, add_devices, discovery_info=None): """ Sets up home assistant scene entries. """ - scene_config = config.get("config") + scene_config = config.get("states") - add_devices([HomeAssistantScene(hass, _process_config(scene_config))]) + if not isinstance(scene_config, list): + scene_config = [scene_config] + + add_devices(HomeAssistantScene(hass, _process_config(scene)) + for scene in scene_config) return True