summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-02-01 21:57:35 +0200
committerLars Wirzenius <liw@liw.fi>2017-02-01 21:57:35 +0200
commit8b9401a6d702e759a6a42aad81c34f4fa47e4b08 (patch)
tree114557815dec2111adf49de4b551040a6bc95368
parentdda830e62cc9367f568af782ed1464fb3af98db0 (diff)
downloaddistix-8b9401a6d702e759a6a42aad81c34f4fa47e4b08.tar.gz
Fix crash when rendering message with unknown charset
-rw-r--r--NEWS2
-rw-r--r--distixlib/message_renderer.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index fdf55e0..fac2eeb 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ distix, a distributed ticketing system.
Version 0.10+git, not yet released
----------------------------------
+* Fix error when rendering message with an unknown character set,
+ resultin in a bad render but no crash.
Version 0.10, released 2017-01-07
---------------------------------
diff --git a/distixlib/message_renderer.py b/distixlib/message_renderer.py
index 9c8d900..e911bd0 100644
--- a/distixlib/message_renderer.py
+++ b/distixlib/message_renderer.py
@@ -43,7 +43,7 @@ class MessageRenderer(object):
def _decode_safely(self, s, encoding):
try:
return s.decode(encoding or 'us-ascii')
- except UnicodeDecodeError:
+ except (LookupError, UnicodeDecodeError):
return repr(s)
def _plain_text_body(self, msg):