openstack/python-heatclient
Code Issues Proposed changes

Merge "Do not use the '+' operation dict_items()"

Browse Source
This commit is contained in:
Jenkins
2014-02-19 06:30:36 +00:00
committed by Gerrit Code Review
parent 6c2b5c7ff7 a68a475cbd
commit 78b2251857
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
heatclient/v1/shell.py
View File

@@ -137,7 +137,7 @@ def do_stack_adopt(hc, args):
'adopt_stack_data': adopt_data,
'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
}
@@ -288,7 +288,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
}
@@ -411,7 +411,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
}