Merge pull request #334 from gittip/response-chokes-on-non-ascii

Response chokes on non ascii
AspenWeb · May 1, 2014 · 17254ce · 17254ce
2 parents 707fa10 + 9c170f0
commit 17254ce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/aspen/http/response.py b/aspen/http/response.py
@@ -113,7 +113,7 @@ def __call__(self, environ, start_response):
         body = self.body
         if isinstance(body, basestring):
             body = [body]
-        body = (x.encode('ascii') if isinstance(x, unicode) else x for x in body)
+        body = (x.encode(self.charset) if isinstance(x, unicode) else x for x in body)
         return CloseWrapper(self.request, body)
 
     def __repr__(self):

diff --git a/aspen/resources/static_resource.py b/aspen/resources/static_resource.py
@@ -24,6 +24,7 @@ def respond(self, request, response=None):
         """
         response = response or Response()
         # XXX Perform HTTP caching here.
+        assert type(self.raw) is str # sanity check
         response.body = self.raw
         response.headers['Content-Type'] = self.media_type
         if self.media_type.startswith('text/'):

diff --git a/tests/test_unicode.py b/tests/test_unicode.py
@@ -28,6 +28,18 @@ def test_non_ascii_bytes_work_with_encoding(harness):
     """).body.strip()
     assert actual == expected
 
+def test_response_as_wsgi_does_something_sane(harness):
+    expected = u'א'.encode('utf8')
+    wsgi = harness.simple(b"""
+        # encoding=utf8
+        [------------------]
+        text = u'א'
+        [------------------]
+        %(text)s""")
+
+    actual = b''.join(list(wsgi({}, lambda a,b: None)))
+    assert actual == expected
+
 
 # decode_raw