Avoid some unicode errors in httpexceptions

1 files changed, 9 insertions, 7 deletions

diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py
index b14ad5a..82ad1b0 100644
--- a/paste/httpexceptions.py
+++ b/paste/httpexceptions.py
@@ -199,13 +199,15 @@ class HTTPException(Exception):
         args = {'explanation': escfunc(self.explanation),
                 'detail': escfunc(self.detail),
                 'comment': comment_escfunc(self.comment)}
-        if HTTPException.template == self.template:
-            return template % args
-        for (k, v) in environ.items():
-            args[k] = escfunc(v)
-        if self.headers:
-            for (k, v) in self.headers:
-                args[k.lower()] = escfunc(v)
+        if HTTPException.template != self.template:
+            for (k, v) in environ.items():
+                args[k] = escfunc(v)
+            if self.headers:
+                for (k, v) in self.headers:
+                    args[k.lower()] = escfunc(v)
+        for key, value in args.items():
+            if isinstance(value, unicode):
+                args[key] = value.encode('ascii', 'utf8')
         return template % args
 
     def plain(self, environ):