2.x backport of [1382] (Fixed bug in encode; shouldn't attempt encode on any body chunk unless it's of type 'unicode').

1 files changed, 7 insertions, 3 deletions

diff --git a/cherrypy/filters/encodingfilter.py b/cherrypy/filters/encodingfilter.py
index d86f46e7..c82ff8ca 100644
--- a/cherrypy/filters/encodingfilter.py
+++ b/cherrypy/filters/encodingfilter.py
@@ -26,8 +26,10 @@ def encode_stream(encoding, errors='strict'):
     being written out.
     """
     def encoder(body):
-        for line in body:
-            yield line.encode(encoding, errors)
+        for chunk in body:
+            if isinstance(chunk, unicode):
+                chunk = chunk.encode(encoding, errors)
+            yield chunk
     cherrypy.response.body = encoder(cherrypy.response.body)
     return True
 
@@ -36,7 +38,9 @@ def encode_string(encoding, errors='strict'):
     try:
         body = []
         for chunk in cherrypy.response.body:
-            body.append(chunk.encode(encoding, errors))
+            if isinstance(chunk, unicode):
+                chunk = chunk.encode(encoding, errors)
+            body.append(chunk)
         cherrypy.response.body = body
     except (LookupError, UnicodeError):
         return False