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

Added your suggestions.

Browse source 
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" !
This commit is contained in:
sander 2016-02-28 21:00:51 +01:00
parent a8edcfd315
commit 0f6ec9b7ac
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/scene/__init__.py
View file

@ -48,7 +48,7 @@ def setup(hass, config):
platform_config = [platform_config] platform_config = [platform_config]
if not any(CONF_PLATFORM in entry for entry in 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] for entry in platform_config]
config[config_key] = platform_config config[config_key] = platform_config

8
homeassistant/components/scene/homeassistant.py
View file

@ -25,9 +25,13 @@ SceneConfig = namedtuple('SceneConfig', ['name', 'states'])
# pylint: disable=unused-argument # pylint: disable=unused-argument
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
""" Sets up home assistant scene entries. """ """ 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 return True