mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-10 06:48:19 +02:00
Code Activity

Merge e332e5e245 into 512c44bca6

Browse source
This commit is contained in:
PaoloC68 2016-03-31 08:59:35 +00:00
commit 2e734ef914
2 changed files with 123 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
django_mailbox/models.py
View file

@ -26,7 +26,7 @@ from django.core.mail.message import make_msgid
from django.db import models
from django.utils.translation import ugettext_lazy as _
from .utils import convert_header_to_unicode, get_body_from_message
from .utils import convert_header_to_unicode, get_body_from_message, cleanup_message
from django_mailbox.signals import message_received
from django_mailbox.transports import Pop3Transport, ImapTransport, \
MaildirTransport, MboxTransport, BabylTransport, MHTransport, \
@ -336,8 +336,7 @@ class Mailbox(models.Model):
msg.get_payload(decode=True).decode(content_charset)
except LookupError:
logger.warning(
"Unknown encoding %s; interpreting as ASCII!",
content_charset
"Unknown encoding %s; interpreting as ASCII!"
)
msg.set_payload(
msg.get_payload(decode=True).decode(
@ -347,8 +346,7 @@ class Mailbox(models.Model):
)
except ValueError:
logger.warning(
"Decoding error encountered; interpreting as ASCII!",
content_charset
"Decoding error encountered; interpreting as ASCII!"
)
msg.set_payload(
msg.get_payload(decode=True).decode(
@ -375,7 +373,7 @@ class Mailbox(models.Model):
elif 'Delivered-To' in message:
msg.to_header = convert_header_to_unicode(message['Delivered-To'])
msg.save()
message = self._get_dehydrated_message(message, msg)
message = cleanup_message(self._get_dehydrated_message(message, msg))
msg.set_body(message.as_string())
if message['in-reply-to']:
try: