Do not use the '+' operation dict_items()

This operation is undefined in Python3, list() must be called first.

Change-Id: I764ee994b5faf0e6783e4025466e6ceb17fe3642
This commit is contained in:
Cyril Roelandt
2014-02-12 17:44:04 +01:00
parent 448d303790
commit a68a475cbd

View File

@@ -83,7 +83,7 @@ def do_stack_create(hc, args):
'disable_rollback': not(args.enable_rollback),
'parameters': utils.format_parameters(args.parameters),
'template': template,
'files': dict(tpl_files.items() + env_files.items()),
'files': dict(list(tpl_files.items()) + list(env_files.items())),
'environment': env
}
@@ -234,7 +234,7 @@ def do_stack_update(hc, args):
'stack_id': args.id,
'parameters': utils.format_parameters(args.parameters),
'template': template,
'files': dict(tpl_files.items() + env_files.items()),
'files': dict(list(tpl_files.items()) + list(env_files.items())),
'environment': env
}
@@ -357,7 +357,7 @@ def do_template_validate(hc, args):
fields = {
'parameters': utils.format_parameters(args.parameters),
'template': template,
'files': dict(tpl_files.items() + env_files.items()),
'files': dict(list(tpl_files.items()) + list(env_files.items())),
'environment': env
}