Merge 6b707a9dcd into 71fcaa2ede

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(

rtd_requirements.txt

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

setup.py

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