From fa58375a51c94ae58fc6b5e3bbaa0222fe404f70 Mon Sep 17 00:00:00 2001
From: Andrew Godwin <andrew@aeracode.org>
Date: Fri, 5 Feb 2016 16:47:11 -0800
Subject: [PATCH] Python 3 fixes

---
 channels/database_layer.py     |  2 +-
 channels/handler.py            | 26 ++++++++++++++++++++++----
 channels/tests/test_request.py |  4 ++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/channels/database_layer.py b/channels/database_layer.py
index 46df924..d85a2e8 100644
--- a/channels/database_layer.py
+++ b/channels/database_layer.py
@@ -71,7 +71,7 @@ class DatabaseChannelLayer(object):
         # Keep making channel names till one isn't present.
         while True:
             random_string = "".join(random.choice(string.ascii_letters) for i in range(8))
-            new_name = pattern.replace(b"?", random_string)
+            new_name = pattern.replace("?", random_string)
             if not self.channel_model.objects.filter(channel=new_name).exists():
                 return new_name
 
diff --git a/channels/handler.py b/channels/handler.py
index 06792fe..b9bdbd6 100644
--- a/channels/handler.py
+++ b/channels/handler.py
@@ -58,12 +58,14 @@ class AsgiRequest(http.HttpRequest):
                 corrected_name = "CONTENT_TYPE"
             else:
                 corrected_name = 'HTTP_%s' % name.upper().replace("-", "_")
-            self.META[corrected_name] = value
+            # TODO: Look at request encoding for unicode decode
+            self.META[corrected_name] = value.decode("latin1")
         # Pull out content length info
         if self.META.get('CONTENT_LENGTH', None):
             try:
                 self._content_length = int(self.META['CONTENT_LENGTH'])
-            except (ValueError, TypeError):
+            except (ValueError, TypeError) as e:
+                print (self.META)
                 pass
         # Body handling
         self._body = message.get("body", b"")
@@ -164,9 +166,25 @@ class AsgiHandler(base.BaseHandler):
         # Collect cookies into headers.
         # Note that we have to preserve header case as there are some non-RFC
         # compliant clients that want things like Content-Type correct. Ugh.
-        response_headers = [(str(k), str(v)) for k, v in response.items()]
+        response_headers = []
+        for header, value in response.items():
+            if isinstance(header, six.binary_type):
+                header = header.decode("latin1")
+            if isinstance(value, six.text_type):
+                value = value.encode("latin1")
+            response_headers.append(
+                (
+                    six.text_type(header),
+                    six.binary_type(value),
+                )
+            )
         for c in response.cookies.values():
-            response_headers.append((str('Set-Cookie'), str(c.output(header=''))))
+            response_headers.append(
+                (
+                    'Set-Cookie',
+                    six.binary_type(c.output(header='')),
+                )
+            )
         # Make initial response message
         message = {
             "status": response.status_code,
diff --git a/channels/tests/test_request.py b/channels/tests/test_request.py
index a103b28..3cf4601 100644
--- a/channels/tests/test_request.py
+++ b/channels/tests/test_request.py
@@ -159,7 +159,7 @@ class RequestTests(SimpleTestCase):
             "body_channel": "test-input",
             "headers": {
                 "content-type": b"multipart/form-data; boundary=BOUNDARY",
-                "content-length": six.binary_type(len(body)),
+                "content-length": six.text_type(len(body)).encode("ascii"),
             },
         }, "test")
         self.channel_layer.send("test-input", {
@@ -175,4 +175,4 @@ class RequestTests(SimpleTestCase):
         self.assertTrue(request.META["CONTENT_TYPE"].startswith("multipart/form-data"))
         self.assertFalse(request._post_parse_error)
         self.assertEqual(request.POST["title"], "My First Book")
-        self.assertEqual(request.FILES["pdf"].read(), "FAKEPDFBYTESGOHERE")
+        self.assertEqual(request.FILES["pdf"].read(), b"FAKEPDFBYTESGOHERE")