1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-09 22:38:19 +02:00

The imports are wrong and log messages are syntactically wrong

parse_qs, unquote, urlparse are not part of six but future.
This commit is contained in:
PaoloC68 2016-04-30 17:58:45 -03:00
parent 71fcaa2ede
commit e1036c78f0

View file

@ -18,13 +18,13 @@ import sys
import uuid
import six
from six.moves.urllib.parse import parse_qs, unquote, urlparse
from django.conf import settings
from django.core.files.base import ContentFile
from django.core.mail.message import make_msgid
from django.db import models
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 django_mailbox.signals import message_received
@ -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!" % content_charset
)
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 %s as ASCII!",
content_charset
"Decoding error encountered; interpreting %s as ASCII!" % content_charset
)
msg.set_payload(
msg.get_payload(decode=True).decode(