Merge pull request #1285 from lwzm/master

Ensure that HTTPServerRequest.body is a byte string
tornadoweb · Jan 10, 2015 · eab34a9 · eab34a9
2 parents dca3f6b + 429aae4
commit eab34a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/tornado/httputil.py b/tornado/httputil.py
@@ -331,7 +331,7 @@ def __init__(self, method=None, uri=None, version="HTTP/1.0", headers=None,
         self.uri = uri
         self.version = version
         self.headers = headers or HTTPHeaders()
-        self.body = body or ""
+        self.body = body or b""
 
         # set remote IP and protocol
         context = getattr(connection, 'context', None)

diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py
@@ -264,6 +264,10 @@ def test_default_constructor(self):
         # more required parameters slip in.
         HTTPServerRequest(uri='/')
 
+    def test_body_is_a_byte_string(self):
+        requets = HTTPServerRequest(uri='/')
+        self.assertIsInstance(requets.body, bytes)
+
 
 class ParseRequestStartLineTest(unittest.TestCase):
     METHOD = "GET"

diff --git a/tornado/wsgi.py b/tornado/wsgi.py
@@ -207,7 +207,7 @@ def __call__(self, environ, start_response):
             body = environ["wsgi.input"].read(
                 int(headers["Content-Length"]))
         else:
-            body = ""
+            body = b""
         protocol = environ["wsgi.url_scheme"]
         remote_ip = environ.get("REMOTE_ADDR", "")
         if environ.get("HTTP_HOST"):