Merge pull request #917 from stealthycoin/message-truncation

local mode message truncation fix

CHANGELOG.rst

@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+Next Release (TBD)
+==================
+
+* Fix local mode issue with unicode responses and Content-Length
+  (`#910 <https://github.com/aws/chalice/pull/910>`__)
+
 1.6.0
 =====
 

chalice/local.py

@@ -576,15 +576,15 @@ def _send_http_response(self, code, headers, body):
     def _send_http_response_with_body(self, code, headers, body):
         # type: (int, HeaderType, Union[str,bytes]) -> None
         self.send_response(code)
+        if not isinstance(body, bytes):
+            body = body.encode('utf-8')
         self.send_header('Content-Length', str(len(body)))
         content_type = headers.pop(
             'Content-Type', 'application/json')
         self.send_header('Content-Type', content_type)
         for header_name, header_value in headers.items():
             self.send_header(header_name, header_value)
         self.end_headers()
-        if not isinstance(body, bytes):
-            body = body.encode('utf-8')
         self.wfile.write(body)
 
     do_GET = do_PUT = do_POST = do_HEAD = do_DELETE = do_PATCH = do_OPTIONS = \

tests/functional/test_local.py

@@ -159,6 +159,19 @@ def test_can_accept_get_request(config, sample_app, local_server_factory):
     assert response.text == '{"hello": "world"}'
 
 
+def test_can_get_unicode_string_content_length(
+        config, local_server_factory):
+        demo = app.Chalice('app-name')
+
+        @demo.route('/')
+        def index_view():
+            return u'\u2713'
+
+        local_server, port = local_server_factory(demo, config)
+        response = local_server.make_call(requests.get, '/', port)
+        assert response.headers['Content-Length'] == '3'
+
+
 def test_can_accept_options_request(config, sample_app, local_server_factory):
     local_server, port = local_server_factory(sample_app, config)
     response = local_server.make_call(requests.options, '/test-cors', port)