summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-04-21 15:50:40 +0200
committerVictor Stinner <victor.stinner@gmail.com>2015-04-21 15:50:40 +0200
commit2d77bec02ffa4df781cf68773a5e67166b43c259 (patch)
tree6772325bde998d4d4153e01aba7fa390b7074b02
parent0148786c504c636d5698507a611e5c06a20abec8 (diff)
downloadpaste-git-2d77bec02ffa4df781cf68773a5e67166b43c259.tar.gz
Fix HTTPException.make_body() on Python 3
Only encode values on Python 2: Python 3 expects text, not bytes.
-rw-r--r--paste/httpexceptions.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py
index 492f558..6b8d5c5 100644
--- a/paste/httpexceptions.py
+++ b/paste/httpexceptions.py
@@ -205,9 +205,10 @@ class HTTPException(Exception):
if self.headers:
for (k, v) in self.headers:
args[k.lower()] = escfunc(v)
- for key, value in args.items():
- if isinstance(value, six.text_type):
- args[key] = value.encode('utf8', 'xmlcharrefreplace')
+ if six.PY2:
+ for key, value in args.items():
+ if isinstance(value, six.text_type):
+ args[key] = value.encode('utf8', 'xmlcharrefreplace')
return template % args
def plain(self, environ):