summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-03-22 19:16:35 +0200
committerLars Wirzenius <liw@liw.fi>2017-03-22 19:16:35 +0200
commit1723767c635156fa8754015c0c06c12d2094dd40 (patch)
tree6260a18b8576705adebbae7408a6998f2af47271
parent8301455fbd806543cfe0b0a8d0f9e3418bc5a95e (diff)
downloaddistix-1723767c635156fa8754015c0c06c12d2094dd40.tar.gz
Handle different errors separate
The original code should work but doesn't on my VPS.
-rw-r--r--distixlib/message_renderer.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/distixlib/message_renderer.py b/distixlib/message_renderer.py
index e911bd0..89f63f0 100644
--- a/distixlib/message_renderer.py
+++ b/distixlib/message_renderer.py
@@ -43,7 +43,9 @@ class MessageRenderer(object):
def _decode_safely(self, s, encoding):
try:
return s.decode(encoding or 'us-ascii')
- except (LookupError, UnicodeDecodeError):
+ except LookupError:
+ return repr(s)
+ except UnicodeDecodeError:
return repr(s)
def _plain_text_body(self, msg):