Fix encoding when body is unicode; #254

If a Response body is a unicode we want to encode it using self.charset when sending to the wire. For static resources the body should be a byte string so we shouldn't need to encode it at all.
AspenWeb · May 1, 2014 · 9c170f0 · 9c170f0
1 parent 4accdf2
commit 9c170f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
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
@@ -35,8 +35,7 @@ def test_response_as_wsgi_does_something_sane(harness):
         [------------------]
         text = u'א'
         [------------------]
-        %(text)s
-    """)
+        %(text)s""")
 
     actual = b''.join(list(wsgi({}, lambda a,b: None)))
     assert actual == expected