mirror of
https://github.com/coddingtonbear/django-mailbox.git
synced 2026-07-10 06:48:19 +02:00
Minor tweaks to logging.
This commit is contained in:
parent
aa59199c9b
commit
f16d4f6d9c
1 changed files with 7 additions and 3 deletions
|
|
@ -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,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue