Fixed suggestions from @balloob

This commit is contained in:
Stefan Jonasson 2015-09-19 17:42:21 +02:00
parent b9e1b3eb99
commit 2084976bc2

View File

@ -42,17 +42,14 @@ def setup(hass, config):
while config_key in config: while config_key in config:
# check for one block syntax # check for one block syntax
if isinstance(config[config_key], dict): if isinstance(config[config_key], dict):
config_block = _migrate_old_config(config[config_key]) name = config[config_key].get(CONF_ALIAS, config_key)
name = config_block.get(CONF_ALIAS, config_key) _setup_automation(hass, config[config_key], name, config)
_setup_automation(hass, config_block, name, config)
# check for multiple block syntax # check for multiple block syntax
elif isinstance(config[config_key], list): elif isinstance(config[config_key], list):
list_no = 0 for list_no, config_block in enumerate(config[config_key]):
for config_block in config[config_key]:
name = config_block.get(CONF_ALIAS, name = config_block.get(CONF_ALIAS,
"{}, {}".format(config_key, list_no)) "{}, {}".format(config_key, list_no))
list_no += 1
config_block = _migrate_old_config(config_block) config_block = _migrate_old_config(config_block)
_setup_automation(hass, config_block, name, config) _setup_automation(hass, config_block, name, config)