From e1036c78f02a4deb36ab6885b86e3cfaeb4c09e0 Mon Sep 17 00:00:00 2001 From: PaoloC68 Date: Sat, 30 Apr 2016 17:58:45 -0300 Subject: [PATCH 1/2] The imports are wrong and log messages are syntactically wrong parse_qs, unquote, urlparse are not part of six but future. --- django_mailbox/models.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/django_mailbox/models.py b/django_mailbox/models.py index 6b76d26..74fce85 100644 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -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( From 6b707a9dcd33f2b8e586c41fa58205b6bdc70040 Mon Sep 17 00:00:00 2001 From: PaoloC68 Date: Sat, 30 Apr 2016 18:10:39 -0300 Subject: [PATCH 2/2] adding correct requirements --- rtd_requirements.txt | 1 + setup.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rtd_requirements.txt b/rtd_requirements.txt index 6a0e7c0..06b7305 100644 --- a/rtd_requirements.txt +++ b/rtd_requirements.txt @@ -1,2 +1,3 @@ django>=1.5,<1.6 six +future \ No newline at end of file diff --git a/setup.py b/setup.py index 8db714b..902605f 100755 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ setup( ], packages=find_packages(), install_requires=[ - 'six>=1.6.1' + 'six>=1.6.1', + 'future>=0.15.2' ] )