From f16d4f6d9c27c568e196de24287e3e7090bf4cae Mon Sep 17 00:00:00 2001
From: Adam Coddington <adam.coddington@coxinc.com>
Date: Sat, 15 Nov 2014 22:18:19 -0800
Subject: [PATCH] Minor tweaks to logging.

---
 django_mailbox/models.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/django_mailbox/models.py b/django_mailbox/models.py
index 2f9dd13..981883d 100644
--- a/django_mailbox/models.py
+++ b/django_mailbox/models.py
@@ -300,8 +300,8 @@ class Mailbox(models.Model):
                 # inside the payload :-\
                 msg.get_payload(decode=True).decode(content_charset)
             except LookupError:
-                logger.exception(
-                    "Unknown encoding %s; interpreting as ascii!",
+                logger.warning(
+                    "Unknown encoding %s; interpreting as ASCII!",
                     content_charset
                 )
                 msg.set_payload(
@@ -310,7 +310,11 @@ class Mailbox(models.Model):
                         'ignore'
                     )
                 )
-            except UnicodeDecodeError:
+            except ValueError:
+                logger.warning(
+                    "Decoding error encountered; interpreting as ASCII!",
+                    content_charset
+                )
                 msg.set_payload(
                     msg.get_payload(decode=True).decode(
                         content_charset,