federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

Minor tweaks to logging.

Browse source
This commit is contained in:
Adam Coddington 2014-11-15 22:18:19 -08:00
parent aa59199c9b
commit f16d4f6d9c
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
django_mailbox/models.py
View file

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