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 6b707a9dcd into 71fcaa2ede

Browse source
This commit is contained in:
PaoloC68 2016-04-30 21:15:08 +00:00
commit fe208b89d3
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
django_mailbox/models.py
View file

@ -18,13 +18,13 @@ import sys
import uuid import uuid
import six import six
from six.moves.urllib.parse import parse_qs, unquote, urlparse
from django.conf import settings from django.conf import settings
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.core.mail.message import make_msgid from django.core.mail.message import make_msgid
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from future.backports.urllib.parse import urlparse, parse_qs, unquote
from .utils import convert_header_to_unicode, get_body_from_message from .utils import convert_header_to_unicode, get_body_from_message
from django_mailbox.signals import message_received from django_mailbox.signals import message_received
@ -336,8 +336,7 @@ class Mailbox(models.Model):
msg.get_payload(decode=True).decode(content_charset) msg.get_payload(decode=True).decode(content_charset)
except LookupError: except LookupError:
logger.warning( logger.warning(
"Unknown encoding %s; interpreting as ASCII!", "Unknown encoding %s; interpreting as ASCII!" % content_charset
content_charset
) )
msg.set_payload( msg.set_payload(
msg.get_payload(decode=True).decode( msg.get_payload(decode=True).decode(
@ -347,8 +346,7 @@ class Mailbox(models.Model):
) )
except ValueError: except ValueError:
logger.warning( logger.warning(
"Decoding error encountered; interpreting %s as ASCII!", "Decoding error encountered; interpreting %s as ASCII!" % content_charset
content_charset
) )
msg.set_payload( msg.set_payload(
msg.get_payload(decode=True).decode( msg.get_payload(decode=True).decode(

1
rtd_requirements.txt
View file

@ -1,2 +1,3 @@
django>=1.5,<1.6 django>=1.5,<1.6
six six
future

3
setup.py
View file

@ -45,6 +45,7 @@ setup(
], ],
packages=find_packages(), packages=find_packages(),
install_requires=[ install_requires=[
'six>=1.6.1' 'six>=1.6.1',
'future>=0.15.2'
] ]
) )