From 1723767c635156fa8754015c0c06c12d2094dd40 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 22 Mar 2017 19:16:35 +0200 Subject: Handle different errors separate The original code should work but doesn't on my VPS. --- distixlib/message_renderer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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): -- cgit v1.2.1