summaryrefslogtreecommitdiff
path: root/cherrypy/lib/encoding.py
diff options
context:
space:
mode:
authorRobert Brewer <fumanchu@aminus.org>2006-09-26 05:56:53 +0000
committerRobert Brewer <fumanchu@aminus.org>2006-09-26 05:56:53 +0000
commita899fd8680ee7088299cd37a4e49a3d07df78b82 (patch)
treeaddfc4c7b511010d92452cdd721c506e9d0fb1c8 /cherrypy/lib/encoding.py
parent0c3982ce9c753d57dd2f23f8eca7668cef50a368 (diff)
downloadcherrypy-git-a899fd8680ee7088299cd37a4e49a3d07df78b82.tar.gz
Fix for #569 (Encoding problems when accessing cherrypy instances from links).
Diffstat (limited to 'cherrypy/lib/encoding.py')
-rw-r--r--cherrypy/lib/encoding.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cherrypy/lib/encoding.py b/cherrypy/lib/encoding.py
index f567bc04..d1d66a45 100644
--- a/cherrypy/lib/encoding.py
+++ b/cherrypy/lib/encoding.py
@@ -78,7 +78,7 @@ def encode_string(encoding, errors='strict'):
for chunk in cherrypy.response.body:
body.append(chunk.encode(encoding, errors))
cherrypy.response.body = body
- except UnicodeError:
+ except (LookupError, UnicodeError):
return False
else:
return True