Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix python 3 issue merging dicts

Browse Source
This commit is contained in:
Joseph Lawson 2014-10-21 13:49:25 -04:00
parent 1d9ffafaa5
commit 83f187fa7e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_cloudformation/test_stack_parsing.py
View File

@ -66,8 +66,8 @@ get_attribute_output = {
} }
} }
outputs_template = dict(dummy_template.items() + output_dict.items()) outputs_template = dict(list(dummy_template.items()) + list(output_dict.items()))
bad_outputs_template = dict(dummy_template.items() + bad_output.items()) bad_outputs_template = dict(list(dummy_template.items()) + list(bad_output.items()))
get_attribute_outputs_template = dict(dummy_template.items() + get_attribute_output.items()) get_attribute_outputs_template = dict(dummy_template.items() + get_attribute_output.items())
dummy_template_json = json.dumps(dummy_template) dummy_template_json = json.dumps(dummy_template)