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

Interpret unknown encodings as ASCII. Fixes #34.

Browse source
This commit is contained in:
Adam Coddington 2014-11-15 22:15:25 -08:00
parent e1b0763a46
commit aa59199c9b
4 changed files with 64 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
django_mailbox/utils.py
View file

@ -52,21 +52,29 @@ def get_body_from_message(message, maintype, subtype):
charset = part.get_content_charset()
this_part = part.get_payload(decode=True)
if charset:
this_part = this_part.decode(charset, 'replace')
try:
this_part = this_part.decode(charset, 'replace')
except LookupError:
this_part = this_part.decode('ascii', 'replace')
logger.warning(
'Unknown encoding %s encountered while decoding '
'text payload. Interpreting as ASCII with '
'replacement, but some data may not be '
'represented as the sender intended.',
charset
)
except ValueError:
this_part = this_part.decode('ascii', 'replace')
logger.warning(
'Error encountered while decoding text '
'payload from an incorrectly-constructed '
'e-mail; payload was converted to ASCII with '
'replacement, but some data may not be '
'represented as the sender intended.'
)
else:
this_part = this_part.decode('ascii', 'replace')
try:
body += this_part
except ValueError:
# Since it did not declare a charset, and we
# *should* be 7-bit clean right now, let's assume it
# is ASCII.
body += this_part.decode('ascii', 'replace')
logger.warning(
'Error encountered while decoding text '
'payload from an incorrectly-constructed '
'e-mail; payload was converted to ASCII with '
'replacement, but some data may not be '
'represented as the sender intended.'
)
body += this_part
return body