From a68a475cbdab1e94ac9beeeb0c8669dbc022dce0 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Wed, 12 Feb 2014 17:44:04 +0100 Subject: [PATCH] Do not use the '+' operation dict_items() This operation is undefined in Python3, list() must be called first. Change-Id: I764ee994b5faf0e6783e4025466e6ceb17fe3642 --- heatclient/v1/shell.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index bf2bf2b7..62bd8d22 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -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 }