From 71d2e1d7de172aaeb45e6990e0cc110b11fc2a6d Mon Sep 17 00:00:00 2001
From: Steve Pulec <spulec@gmail.com>
Date: Sun, 2 Aug 2015 11:37:10 -0400
Subject: [PATCH] Python3 fixes for cloudformation server.

---
 tests/test_cloudformation/test_server.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/test_cloudformation/test_server.py b/tests/test_cloudformation/test_server.py
index d45c3dc4a..47a094630 100644
--- a/tests/test_cloudformation/test_server.py
+++ b/tests/test_cloudformation/test_server.py
@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 import json
-import urllib
+from six.moves.urllib.parse import urlencode
 import re
-import sure # noqa
+import sure  # noqa
 
 import moto.server as server
 
@@ -11,6 +11,7 @@ import moto.server as server
 Test the different server responses
 '''
 
+
 def test_cloudformation_server_get():
     backend = server.create_backend_app("cloudformation")
     stack_name = 'test stack'
@@ -20,18 +21,19 @@ def test_cloudformation_server_get():
     }
     res = test_client.get(
         '/?{0}'.format(
-        urllib.urlencode({
-            "Action": "CreateStack",
-            "StackName": stack_name,
-            "TemplateBody": json.dumps(template_body)
-        })),
-        headers={"Host":"cloudformation.us-east-1.amazonaws.com"}
+            urlencode({
+                "Action": "CreateStack",
+                "StackName": stack_name,
+                "TemplateBody": json.dumps(template_body)
+            })
+        ),
+        headers={"Host": "cloudformation.us-east-1.amazonaws.com"}
     )
-    stack_id = json.loads(res.data)["CreateStackResponse"]["CreateStackResult"]["StackId"]
+    stack_id = json.loads(res.data.decode("utf-8"))["CreateStackResponse"]["CreateStackResult"]["StackId"]
 
     res = test_client.get(
         '/?Action=ListStacks',
-        headers={"Host":"cloudformation.us-east-1.amazonaws.com"}
+        headers={"Host": "cloudformation.us-east-1.amazonaws.com"}
     )
     stacks = re.search("<StackId>(.*)</StackId>", res.data.decode('utf-8'))