From 83f187fa7e255898e94a7f46c3573e2d97a62832 Mon Sep 17 00:00:00 2001 From: Joseph Lawson Date: Tue, 21 Oct 2014 13:49:25 -0400 Subject: [PATCH] fix python 3 issue merging dicts --- tests/test_cloudformation/test_stack_parsing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_cloudformation/test_stack_parsing.py b/tests/test_cloudformation/test_stack_parsing.py index 53ef6945..9cb30aba 100644 --- a/tests/test_cloudformation/test_stack_parsing.py +++ b/tests/test_cloudformation/test_stack_parsing.py @@ -66,8 +66,8 @@ get_attribute_output = { } } -outputs_template = dict(dummy_template.items() + output_dict.items()) -bad_outputs_template = dict(dummy_template.items() + bad_output.items()) +outputs_template = dict(list(dummy_template.items()) + list(output_dict.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()) dummy_template_json = json.dumps(dummy_template)