unicode_literals everywhere and modoboa-admin deploy fixes

bin/modoboa-admin.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # coding: utf-8
 
+from __future__ import unicode_literals
+
 from modoboa.core.commands import handle_command_line
 
 if __name__ == "__main__":

modoboa/__init__.py

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

modoboa/admin/__init__.py

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

modoboa/admin/api.py

@@ -1,5 +1,7 @@
 """Admin API."""
 
+from __future__ import unicode_literals
+
 from django import http
 
 from django.contrib.contenttypes.models import ContentType

modoboa/admin/app_settings.py

@@ -1,5 +1,7 @@
 """Modoboa admin settings."""
 
+from __future__ import unicode_literals
+
 import os
 
 from django import forms

modoboa/admin/apps.py

@@ -1,5 +1,7 @@
 """AppConfig for admin."""
 
+from __future__ import unicode_literals
+
 from django.apps import AppConfig
 
 from .app_settings import load_admin_settings

modoboa/admin/constants.py

@@ -1,5 +1,7 @@
 """Admin constants."""
 
+from __future__ import unicode_literals
+
 DNSBL_PROVIDERS = [
     "aspews.ext.sorbs.net",
     "b.barracudacentral.org",

modoboa/admin/factories.py

@@ -1,6 +1,9 @@
 """
 Fixtures factories.
 """
+
+from __future__ import unicode_literals
+
 import factory
 
 from modoboa.core.factories import PermissionFactory, UserFactory

modoboa/admin/forms/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from .domain import (
     DomainFormGeneral, DomainFormOptions, DomainForm, DomainWizard
 )

modoboa/admin/forms/account.py

@@ -1,5 +1,7 @@
 """Forms related to accounts management."""
 
+from __future__ import unicode_literals
+
 from collections import OrderedDict
 from functools import reduce
 

modoboa/admin/forms/alias.py

@@ -1,5 +1,7 @@
 """Forms related to aliases management."""
 
+from __future__ import unicode_literals
+
 from collections import OrderedDict
 
 from django import forms

modoboa/admin/forms/domain.py

@@ -1,5 +1,7 @@
 """Forms related to domains management."""
 
+from __future__ import unicode_literals
+
 from functools import reduce
 
 from django import forms

modoboa/admin/forms/export.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django import forms
 from django.utils.translation import ugettext_lazy
 

modoboa/admin/forms/forward.py

@@ -1,5 +1,7 @@
 """Forms related to forwards management."""
 
+from __future__ import unicode_literals
+
 from django import forms
 from django.core import validators
 from django.utils.translation import ugettext_lazy

modoboa/admin/forms/import_.py

@@ -1,5 +1,7 @@
 """Forms related to import operations."""
 
+from __future__ import unicode_literals
+
 from django import forms
 from django.utils.translation import ugettext_lazy
 

modoboa/admin/handlers.py

@@ -1,5 +1,7 @@
 """Django signal handlers for admin."""
 
+from __future__ import unicode_literals
+
 from django.core.urlresolvers import reverse
 from django.db.models import signals
 from django.dispatch import receiver

modoboa/admin/lib.py

@@ -2,6 +2,8 @@
 
 """Internal library for admin."""
 
+from __future__ import unicode_literals
+
 from functools import wraps
 from itertools import chain
 

modoboa/admin/management/__init__.py

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

modoboa/admin/management/commands/__init__.py

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

modoboa/admin/management/commands/handle_mailbox_operations.py

@@ -1,6 +1,6 @@
 """A management command to apply mailbox operations."""
 
-from __future__ import print_function
+from __future__ import unicode_literals, print_function
 
 import logging
 import os

modoboa/admin/management/commands/modo.py

@@ -1,5 +1,7 @@
 """Modoboa main management command."""
 
+from __future__ import unicode_literals
+
 from subcommand.base import SubcommandCommand
 
 from .subcommands._mx import CheckMXRecords

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

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

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

@@ -1,5 +1,7 @@
 """Django management command to export admin objects."""
 
+from __future__ import unicode_literals
+
 import csv
 import sys
 

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

@@ -1,5 +1,7 @@
 """Django management command to import admin objects."""
 
+from __future__ import unicode_literals
+
 import csv
 import os
 

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

@@ -1,6 +1,6 @@
 """Management command to check defined domains."""
 
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from datetime import timedelta
 import ipaddress

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

@@ -1,6 +1,6 @@
 """Management command to check and fix known problems."""
 
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from django.conf import settings
 from django.core.management.base import BaseCommand

modoboa/admin/migrations/__init__.py

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

modoboa/admin/models/__init__.py

@@ -1,5 +1,7 @@
 """Admin models."""
 
+from __future__ import unicode_literals
+
 from .base import AdminObject
 from .domain import Domain, MXRecord, DNSBLResult
 from .domain_alias import DomainAlias

modoboa/admin/models/alias.py

@@ -1,5 +1,7 @@
 """Models related to aliases management."""
 
+from __future__ import unicode_literals
+
 import hashlib
 import random
 

modoboa/admin/models/base.py

@@ -1,5 +1,7 @@
 """Base admin models."""
 
+from __future__ import unicode_literals
+
 from django.db import models
 from django.utils import timezone
 

modoboa/admin/models/domain.py

@@ -1,5 +1,7 @@
 """Models related to domains management."""
 
+from __future__ import unicode_literals
+
 import datetime
 from functools import reduce
 

modoboa/admin/models/domain_alias.py

@@ -1,5 +1,7 @@
 """Models related to domain aliases management."""
 
+from __future__ import unicode_literals
+
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible, smart_text
 from django.utils.translation import ugettext as _, ugettext_lazy

modoboa/admin/models/mailbox.py

@@ -1,5 +1,7 @@
 """Models related to mailboxes management."""
 
+from __future__ import unicode_literals
+
 import os
 import pwd
 

modoboa/admin/postfix_maps.py

@@ -1,5 +1,7 @@
 """Map file definitions for postfix."""
 
+from __future__ import unicode_literals
+
 
 class DomainsMap(object):
 

modoboa/admin/serializers.py

@@ -1,5 +1,7 @@
 """Admin serializers."""
 
+from __future__ import unicode_literals
+
 from django.core.exceptions import ValidationError
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext as _, ugettext_lazy

modoboa/admin/signals.py

@@ -1,5 +1,7 @@
 """Modoboa admin signals."""
 
+from __future__ import unicode_literals
+
 import django.dispatch
 
 check_extra_account_form = django.dispatch.Signal(

modoboa/admin/templatetags/__init__.py

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

modoboa/admin/templatetags/admin_tags.py

@@ -1,5 +1,7 @@
 """Admin extension tags."""
 
+from __future__ import unicode_literals
+
 from functools import reduce
 
 from django import template

modoboa/admin/tests/__init__.py

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

modoboa/admin/tests/test_account.py

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+from __future__ import unicode_literals
+
 from unittest import skipIf
 
 from django.core.urlresolvers import reverse

modoboa/admin/tests/test_alias.py

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+from __future__ import unicode_literals
+
 """Admin test cases."""
 
 from django.core.urlresolvers import reverse

modoboa/admin/tests/test_api.py

@@ -1,6 +1,8 @@
 # coding: utf-8
 """Admin API related tests."""
 
+from __future__ import unicode_literals
+
 import copy
 import json
 

modoboa/admin/tests/test_domain.py

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+from __future__ import unicode_literals
+
 """Domain related test cases."""
 
 import json

modoboa/admin/tests/test_domain_alias.py

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+from __future__ import unicode_literals
+
 from django.core.urlresolvers import reverse
 
 from modoboa.lib.tests import ModoTestCase

modoboa/admin/tests/test_export.py

@@ -1,5 +1,7 @@
 """Export related test cases."""
 
+from __future__ import unicode_literals
+
 from django.core.urlresolvers import reverse
 
 from modoboa.lib.tests import ModoTestCase

modoboa/admin/tests/test_import_.py

@@ -1,4 +1,7 @@
 # coding: utf-8
+
+from __future__ import unicode_literals
+
 from django.core.files.base import ContentFile
 from django.core.urlresolvers import reverse
 

modoboa/admin/tests/test_mailbox_operations.py

@@ -1,5 +1,7 @@
 """Management command tests."""
 
+from __future__ import unicode_literals
+
 import os
 import shutil
 import tempfile

modoboa/admin/tests/test_mapfiles.py

@@ -1,5 +1,7 @@
 """Test map files generation."""
 
+from __future__ import unicode_literals
+
 import os
 
 from django.conf import settings

modoboa/admin/tests/test_mx.py

@@ -1,5 +1,7 @@
 """DNSBL related tests."""
 
+from __future__ import unicode_literals
+
 from django.core import management
 from django.core.urlresolvers import reverse
 from django.test import override_settings

modoboa/admin/tests/test_password_schemes.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.core.urlresolvers import reverse
 
 from modoboa.core.models import User

modoboa/admin/tests/test_repair.py

@@ -1,4 +1,7 @@
 """Repair command tests"""
+
+from __future__ import unicode_literals
+
 from django.core import management
 
 from modoboa.lib.permissions import get_object_owner

modoboa/admin/tests/test_user.py

@@ -1,5 +1,7 @@
 """User related tests."""
 
+from __future__ import unicode_literals
+
 import json
 
 from django.core.urlresolvers import reverse

modoboa/admin/urls.py

@@ -1,6 +1,8 @@
 # pylint: disable=invalid-name, protected-access
 """Admin urls."""
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

modoboa/admin/urls_api.py

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

modoboa/admin/views/__init__.py

@@ -1,5 +1,7 @@
 """Shortcuts."""
 
+from __future__ import unicode_literals
+
 from .alias import AliasDetailView
 from .identity import AccountDetailView
 from .dns import DNSBLDomainDetailView, MXDomainDetailView

modoboa/admin/views/alias.py

@@ -1,5 +1,7 @@
 """Alias related views."""
 
+from __future__ import unicode_literals
+
 from django.core.urlresolvers import reverse
 from django.db import IntegrityError
 from django.shortcuts import render

modoboa/admin/views/dns.py

@@ -1,5 +1,7 @@
 """DNSBL related views."""
 
+from __future__ import unicode_literals
+
 from django.views import generic
 
 from django.utils.translation import ugettext as _

modoboa/admin/views/domain.py

@@ -1,5 +1,7 @@
 """Domain related views."""
 
+from __future__ import unicode_literals
+
 from functools import reduce
 
 from django.core.urlresolvers import reverse

modoboa/admin/views/export.py

@@ -1,5 +1,7 @@
 """Export related views."""
 
+from __future__ import unicode_literals
+
 import csv
 import io
 

modoboa/admin/views/identity.py

@@ -1,5 +1,7 @@
 """Identity related views."""
 
+from __future__ import unicode_literals
+
 from django.shortcuts import render
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext as _, ungettext

modoboa/admin/views/import_.py

@@ -1,5 +1,7 @@
 """Import related views."""
 
+from __future__ import unicode_literals
+
 import csv
 
 from django.contrib.auth.decorators import (

modoboa/admin/views/user.py

@@ -1,5 +1,7 @@
 """SimpleUsers views."""
 
+from __future__ import unicode_literals
+
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext as _
 

modoboa/core/__init__.py

@@ -1,3 +1,5 @@
 """App config for core."""
 
+from __future__ import unicode_literals
+
 default_app_config = "modoboa.core.apps.CoreConfig"

modoboa/core/app_settings.py

@@ -1,4 +1,7 @@
 # coding: utf-8
+
+from __future__ import unicode_literals
+
 from django import forms
 from django.conf import settings
 from django.utils.translation import ugettext as _, ugettext_lazy

modoboa/core/apps.py

@@ -1,5 +1,7 @@
 """Core config for admin."""
 
+from __future__ import unicode_literals
+
 from django.apps import AppConfig
 from django.db.models import signals
 from django.utils.translation import ugettext_lazy

modoboa/core/commands/__init__.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from __future__ import print_function
+from __future__ import unicode_literals, print_function
 
 import argparse
 import os
@@ -8,6 +8,7 @@ import sys
 
 from django.conf import settings
 from django.template import Context, Template
+from django.utils import six
 
 
 class Command(object):
@@ -65,8 +66,12 @@ def scan_for_commands(dirname=""):
         if os.path.isfile(f):
             continue
         cmdname = f.replace(".py", "")
+        if six.PY2:
+            fromlist = [cmdname.encode()]
+        else:
+            fromlist = [cmdname]
         cmdmod = __import__("modoboa.core.commands", globals(), locals(),
-                            [cmdname])
+                            fromlist)
         cmdmod = getattr(cmdmod, cmdname)
         if "_" in cmdname:
             cmdclassname = "".join(

modoboa/core/commands/deploy.py

@@ -2,7 +2,7 @@
 
 """A shortcut to deploy a fresh modoboa instance."""
 
-from __future__ import print_function
+from __future__ import unicode_literals, print_function
 
 import getpass
 import os
@@ -21,6 +21,7 @@ except ImportError:
 import django
 from django.core import management
 from django.template import Context, Template
+from django.utils import six
 import dj_database_url
 
 from modoboa.core.commands import Command
@@ -231,7 +232,11 @@ class DeployCommand(Command):
             os.path.join(os.path.dirname(__file__), "../../bower_components")
         )
 
-        mod = __import__(parsed_args.name, globals(), locals(), ['settings'])
+        if six.PY2:
+            fromlist = ['settings'.encode()]
+        else:
+            fromlist = ['settings']
+        mod = __import__(parsed_args.name, globals(), locals(), fromlist)
         tpl = self._render_template(
             "%s/settings.py.tpl" % self._templates_dir, {
                 'db_connections': connections,

modoboa/core/commands/help.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from __future__ import print_function
+from __future__ import unicode_literals, print_function
 
 import sys
 

modoboa/core/constants.py

@@ -2,6 +2,8 @@
 
 """Core application constants."""
 
+from __future__ import unicode_literals
+
 from django.utils.translation import ugettext_lazy
 
 SIMPLEUSERS_ROLE = ("SimpleUsers", ugettext_lazy("Simple user"))

modoboa/core/context_processors.py

@@ -1,5 +1,7 @@
 """Custom context processors."""
 
+from __future__ import unicode_literals
+
 from functools import reduce
 
 from . import signals

modoboa/core/dev_settings.py

@@ -1,4 +1,7 @@
 # Development settings
+
+from __future__ import unicode_literals
+
 import os
 
 BOWER_COMPONENTS_ROOT = os.path.join(

modoboa/core/extensions.py

@@ -1,7 +1,10 @@
 """Extension management."""
 
+from __future__ import unicode_literals
+
 from django.conf import settings
 from django.conf.urls import include, url
+from django.utils import six
 
 
 class ModoExtension(object):
@@ -76,7 +79,11 @@ class ExtensionsPool(object):
 
     def load_extension(self, name):
         """Load a registered extension."""
-        __import__(name, locals(), globals(), ["modo_extension"])
+        if six.PY2:
+            fromlist = ["modo_extension".encode()]
+        else:
+            fromlist = ["modo_extension"]
+        __import__(name, locals(), globals(), fromlist)
         extinstance = self.get_extension(name)
         if extinstance is None:
             return None

modoboa/core/factories.py

@@ -1,5 +1,7 @@
 """Factories for core application."""
 
+from __future__ import unicode_literals
+
 import factory
 
 from django.contrib.auth.models import Group

modoboa/core/forms.py

@@ -2,6 +2,8 @@
 
 """Core forms."""
 
+from __future__ import unicode_literals
+
 from django import forms
 from django.utils.translation import ugettext as _, ugettext_lazy
 

modoboa/core/handlers.py

@@ -1,5 +1,7 @@
 """Modoboa core signal handlers."""
 
+from __future__ import unicode_literals
+
 import logging
 
 from django.core.urlresolvers import reverse

modoboa/core/loggers.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import logging
 
 

modoboa/core/management/__init__.py

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

modoboa/core/management/commands/__init__.py

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

modoboa/core/management/commands/cleanlogs.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import datetime
 import logging

modoboa/core/management/commands/communicate_with_public_api.py

@@ -1,5 +1,7 @@
 """Management command to communicate with public API."""
 
+from __future__ import unicode_literals
+
 from django.core.management.base import BaseCommand, CommandError
 
 from modoboa.admin import models as admin_models

modoboa/core/management/commands/generate_postfix_maps.py

@@ -1,5 +1,5 @@
 """Management command to generate/update postfix map files."""
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import copy
 import hashlib

modoboa/core/management/commands/load_initial_data.py

@@ -5,6 +5,8 @@
 
 """
 
+from __future__ import unicode_literals
+
 from functools import reduce
 
 from django.contrib.auth.models import Group

modoboa/core/management/commands/set_default_site.py

@@ -5,6 +5,8 @@ A simple managemenent command to update the default site.
 See `https://docs.djangoproject.com/en/dev/ref/contrib/sites/`_.
 """
 
+from __future__ import unicode_literals
+
 from django.core.management.base import BaseCommand, CommandError
 
 from django.contrib.sites.models import Site

modoboa/core/middleware.py

@@ -1,5 +1,7 @@
 """Core middlewares."""
 
+from __future__ import unicode_literals
+
 from . import models
 
 

modoboa/core/migrations/__init__.py

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

modoboa/core/mocks.py

@@ -1,5 +1,7 @@
 """Mocks used for testing."""
 
+from __future__ import unicode_literals
+
 import httmock
 
 

modoboa/core/models.py

@@ -1,5 +1,7 @@
 """Core models."""
 
+from __future__ import unicode_literals
+
 from email.header import Header
 import re
 

modoboa/core/password_hashers/__init__.py

@@ -1,6 +1,9 @@
 """
 Password hashers for Modoboa.
 """
+
+from __future__ import unicode_literals
+
 from modoboa.core.password_hashers.base import (
     PLAINHasher, CRYPTHasher, MD5Hasher, SHA256Hasher
 )

modoboa/core/password_hashers/advanced.py

@@ -4,6 +4,8 @@ Advanced (ie. stronger) password hashers.
 This module relies on `passlib` to provide more secure hashers.
 """
 
+from __future__ import unicode_literals
+
 from passlib.hash import bcrypt, md5_crypt, sha256_crypt, sha512_crypt
 
 from modoboa.parameters import tools as param_tools

modoboa/core/password_hashers/base.py

@@ -4,6 +4,8 @@ Base password hashers.
 Contains weak hashers (the original ones) available with Modoboa.
 """
 
+from __future__ import unicode_literals
+
 import base64
 import crypt
 import hashlib

modoboa/core/signals.py

@@ -1,5 +1,7 @@
 """Modoboa core signals."""
 
+from __future__ import unicode_literals
+
 import django.dispatch
 
 account_auto_created = django.dispatch.Signal(providing_args=["user"])

modoboa/core/templatetags/__init__.py

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

modoboa/core/templatetags/core_tags.py

@@ -1,6 +1,8 @@
 # coding: utf-8
 """Custom tags for Core application."""
 
+from __future__ import unicode_literals
+
 from functools import reduce
 import os
 import pkg_resources

modoboa/core/tests/__init__.py

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

modoboa/core/tests/stupid_extension_1/__init__.py

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

modoboa/core/tests/stupid_extension_1/modo_extension.py

@@ -1,5 +1,7 @@
 """A stupid extension used for tests."""
 
+from __future__ import unicode_literals
+
 from modoboa.core import extensions
 
 

modoboa/core/tests/stupid_extension_2/__init__.py

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

modoboa/core/tests/stupid_extension_2/modo_extension.py

@@ -1,5 +1,7 @@
 """A stupid extension used for tests."""
 
+from __future__ import unicode_literals
+
 from modoboa.core import extensions
 
 
@@ -11,4 +13,5 @@ class StupidExtension2(extensions.ModoExtension):
     version = "1.0.0"
     description = "A stupid extension"
 
+
 extensions.exts_pool.register_extension(StupidExtension2, show=False)

modoboa/core/tests/stupid_extension_2/urls.py

@@ -1,5 +1,7 @@
 """Custom urls."""
 
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from . import views

modoboa/core/tests/stupid_extension_2/views.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django import http