Convert headers to strings in HTTP20Adapter to fix #324 (#335)

KOLANICH · Lukasa · commit 834585262308 · 2017-07-05T09:34:02.000+01:00
* Convert headers to strings in HTTP20Adapter to fix #324 * Update contrib.py * Update test_integration.py * Update test_integration.py * Update contrib.py * Update contrib.py * Update contrib.py * Update contrib.py
diff --git a/hyper/contrib.py b/hyper/contrib.py
@@ -19,6 +19,7 @@
 from hyper.common.connection import HTTPConnection
 from hyper.compat import urlparse, ssl
 from hyper.tls import init_context
+from hyper.common.util import to_native_string
 
 
 class HTTP20Adapter(HTTPAdapter):
@@ -132,7 +133,10 @@ def build_response(self, request, resp):
         response = Response()
 
         response.status_code = resp.status
-        response.headers = CaseInsensitiveDict(resp.headers.iter_raw())
+        response.headers = CaseInsensitiveDict((
+            map(to_native_string, h)
+            for h in resp.headers.iter_raw()
+        ))
         response.raw = resp
         response.reason = resp.reason
         response.encoding = get_encoding_from_headers(response.headers)
diff --git a/test/test_integration.py b/test/test_integration.py
@@ -1294,7 +1294,7 @@ def socket_handler(listener):
 
         # Assert about the received values.
         assert r.status_code == 200
-        assert r.headers[b'Content-Type'] == b'not/real'
+        assert r.headers['Content-Type'] == 'not/real'
         assert r.content == b'1234567890' * 2
 
         recv_event.set()
@@ -1417,9 +1417,9 @@ def socket_handler(listener):
 
         assert r.status_code == 201
         assert len(r.headers) == 3
-        assert r.headers[b'server'] == b'socket-level-server'
-        assert r.headers[b'content-length'] == b'0'
-        assert r.headers[b'connection'] == b'close'
+        assert r.headers['server'] == 'socket-level-server'
+        assert r.headers['content-length'] == '0'
+        assert r.headers['connection'] == 'close'
 
         assert r.content == b''
 
@@ -1480,9 +1480,9 @@ def socket_handler(listener):
 
         assert r.status_code == 201
         assert len(r.headers) == 3
-        assert r.headers[b'server'] == b'socket-level-server'
-        assert r.headers[b'content-length'] == b'0'
-        assert r.headers[b'connection'] == b'close'
+        assert r.headers['server'] == 'socket-level-server'
+        assert r.headers['content-length'] == '0'
+        assert r.headers['connection'] == 'close'
 
         assert r.content == b''
 
@@ -1530,9 +1530,9 @@ def socket_handler(listener):
 
         assert r.status_code == 201
         assert len(r.headers) == 3
-        assert r.headers[b'server'] == b'socket-level-server'
-        assert r.headers[b'content-length'] == b'0'
-        assert r.headers[b'connection'] == b'close'
+        assert r.headers['server'] == 'socket-level-server'
+        assert r.headers['content-length'] == '0'
+        assert r.headers['connection'] == 'close'
 
         assert r.content == b''
 
