Jason R. Coombs avatar Jason R. Coombs committed 1648a97

Fixed failure on Python 2 in cherrypy.test.test_json:JsonTest.test_json_input when the error message had unicode in it.

Comments (0)

Files changed (1)

cherrypy/_cperror.py

         response.headers['Content-Type'] = "text/html;charset=utf-8"
         response.headers.pop('Content-Length', None)
 
-        content = ntob(self.get_error_page(self.status, traceback=tb,
-                                           message=self._message), 'utf-8')
+        content = self.get_error_page(self.status, traceback=tb,
+            message=self._message).encode('utf-8')
         response.body = content
 
         _be_ie_unfriendly(self.code)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.