import unicode_literals

and remove it from empty __init__.py files

doc/conf.py

@@ -11,7 +11,10 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from __future__ import unicode_literals
+
 import os
+
 # import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,

modoboa/admin/management/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/admin/management/commands/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/admin/management/commands/subcommands/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/admin/templatetags/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/admin/tests/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/core/checks/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+
 # Import these to force registration of checks
 from . import settings_checks  # NOQA:F401

modoboa/core/management/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/core/management/commands/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/core/templatetags/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/core/tests/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/core/tests/stupid_extension_1/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/core/tests/stupid_extension_2/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/lib/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/lib/imap_utf7.py

@@ -171,33 +171,33 @@ __all__ = ["imapUTF7Encode", "imapUTF7Decode", ]
 
 if __name__ == "__main__":
 
-    # print u'bøx'.encode('imap4-utf-7')
+    # print 'bøx'.encode('imap4-utf-7')
     # print 'expected b&APg-x'
 
-    # print u'båx'.encode('imap4-utf-7')
+    # print 'båx'.encode('imap4-utf-7')
     # print 'expected b&AOU-x'
 
     print("#######")
     print("bøx")
-    e = imapUTF7Encode(u'bøx')
+    e = imapUTF7Encode("bøx")
     print(e)
     print(imapUTF7Decode(e).encode("latin-1"))
 
     print("#######")
     print("båx")
-    e = imapUTF7Encode(u'båx')
+    e = imapUTF7Encode("båx")
     print(e)
     print(imapUTF7Decode(e).encode("latin-1"))
 
     print("#######")
     print("~/bågø")
-    e = imapUTF7Encode(u'~/bågø')
+    e = imapUTF7Encode("~/bågø")
     print(e)
     print(imapUTF7Decode(e).encode("latin-1"))
 
     print("#######")
     print("Ting & Såger")
-    e = imapUTF7Encode(u'Ting & Såger')
+    e = imapUTF7Encode("Ting & Såger")
     print(e)
     print(imapUTF7Decode(e).encode("latin-1"))
 
@@ -209,7 +209,7 @@ if __name__ == "__main__":
 
     print("#######")
     print("~/Følder/mailbåx & stuff + more")
-    n = u'~/Følder/mailbåx & stuff + more'
+    n = "~/Følder/mailbåx & stuff + more"
     e = imapUTF7Encode(n)
     print(e)
     print(imapUTF7Decode(e).encode("latin-1"))

modoboa/lib/templatetags/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/limits/tests/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/limits/views.py

@@ -1,3 +0,0 @@
-# coding: utf-8
-
-from __future__ import unicode_literals

modoboa/parameters/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

modoboa/relaydomains/serializers.py

@@ -1,5 +1,7 @@
 """RelayDomain serializers."""
 
+from __future__ import unicode_literals
+
 import json
 
 from django.utils.translation import ugettext as _

modoboa/relaydomains/transport.py

@@ -1,5 +1,7 @@
 """Transport backend definition."""
 
+from __future__ import unicode_literals
+
 from django.utils.translation import ugettext_lazy as _
 
 from modoboa.transport import backends

modoboa/relaydomains/urls_api.py

@@ -1,5 +1,7 @@
 """Transport API urls."""
 
+from __future__ import unicode_literals
+
 from rest_framework import routers
 
 from . import viewsets

modoboa/relaydomains/viewsets.py

@@ -1,5 +1,7 @@
 """RelayDomain viewsets."""
 
+from __future__ import unicode_literals
+
 from rest_framework import viewsets
 from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated
 

modoboa/transport/__init__.py

@@ -1 +1,3 @@
+from __future__ import unicode_literals
+
 default_app_config = "modoboa.transport.apps.TransportConfig"

modoboa/transport/backends.py

@@ -1,5 +1,7 @@
 """Transport backend."""
 
+from __future__ import unicode_literals
+
 from django import forms
 from django.core import validators
 from django.utils.translation import ugettext_lazy as _

modoboa/transport/constants.py

@@ -1,4 +1,5 @@
 """Transport constants."""
+from __future__ import unicode_literals
 
 PERMISSIONS = {
 

modoboa/transport/factories.py

@@ -1,5 +1,7 @@
 """Transport factories."""
 
+from __future__ import unicode_literals
+
 import factory
 
 from . import models

modoboa/transport/forms.py

@@ -1,5 +1,7 @@
 """Transport forms."""
 
+from __future__ import unicode_literals
+
 from django import forms
 
 from . import backends, models

tests.py

@@ -1,4 +1,6 @@
 # coding: utf-8
+from __future__ import unicode_literals
+
 import os
 import tempfile
 import unittest