Merge pull request #201 from irachex/py27-compat

For python2.7 compatibility

Author: Lukasa

hyper/http20/connection.py

@@ -9,7 +9,7 @@
 from ..common.exceptions import ConnectionResetError
 from ..common.bufsocket import BufferedSocket
 from ..common.headers import HTTPHeaderMap
-from ..common.util import to_host_port_tuple, to_native_string
+from ..common.util import to_host_port_tuple, to_native_string, to_bytestring
 from ..packages.hyperframe.frame import (
     FRAMES, DataFrame, HeadersFrame, PushPromiseFrame, RstStreamFrame,
     SettingsFrame, Frame, WindowUpdateFrame, GoAwayFrame, PingFrame,
@@ -179,8 +179,8 @@ def request(self, method, url, body=None, headers={}):
             self.putheader(name, value, stream_id, replace=is_default)
 
         # Convert the body to bytes if needed.
-        if isinstance(body, str):
-            body = body.encode('utf-8')
+        if body:
+            body = to_bytestring(body)
 
         self.endheaders(message_body=body, final=True, stream_id=stream_id)
 

test/test_hyper.py

@@ -221,6 +221,22 @@ def test_putrequest_sends_data(self):
         assert len(sock.queue) == 2
         assert c._out_flow_control_window == 65535 - len(b'hello')
 
+    def test_request_with_utf8_bytes_body(self):
+        c = HTTP20Connection('www.google.com')
+        c._sock = DummySocket()
+        body = '你好' if is_py2 else '你好'.encode('utf-8')
+        c.request('GET', '/', body=body)
+
+        assert c._out_flow_control_window == 65535 - len(body)
+
+    def test_request_with_unicode_body(self):
+        c = HTTP20Connection('www.google.com')
+        c._sock = DummySocket()
+        body = '你好'.decode('unicode-escape') if is_py2 else '你好'
+        c.request('GET', '/', body=body)
+
+        assert c._out_flow_control_window == 65535 - len(body.encode('utf-8'))
+
     def test_different_request_headers(self):
         sock = DummySocket()