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

Fix UnicodeDecodeError in MessageAttachment headers

Browse source
This commit is contained in:
Antonio Corroppoli 2015-08-14 14:48:27 +02:00
parent 4b49b0b045
commit e766174fdd
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
django_mailbox/models.py
View file

@ -736,7 +736,10 @@ class MessageAttachment(models.Model):
if headers is None: if headers is None:
return EmailMessage() return EmailMessage()
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
headers = headers.encode('utf-8') try:
headers = headers.encode('utf-8')
except UnicodeDecodeError:
headers = unicode(headers, 'utf-8').encode('utf-8')
return email.message_from_string(headers) return email.message_from_string(headers)
def _set_dehydrated_headers(self, email_object): def _set_dehydrated_headers(self, email_object):