Update imports for Python 3.4+

bin/modoboa-admin.py

@@ -1,8 +1,6 @@
 #!/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

@@ -2,8 +2,6 @@
 
 """Modoboa - Mail hosting made simple."""
 
-from __future__ import unicode_literals
-
 from pkg_resources import DistributionNotFound, get_distribution
 
 try:

modoboa/admin/__init__.py

@@ -1,5 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 default_app_config = "modoboa.admin.apps.AdminConfig"

modoboa/admin/api.py

@@ -2,8 +2,6 @@
 
 """Admin API."""
 
-from __future__ import unicode_literals
-
 from django import http
 from django.contrib.contenttypes.models import ContentType
 

modoboa/admin/app_settings.py

@@ -2,8 +2,6 @@
 
 """Modoboa admin settings."""
 
-from __future__ import unicode_literals
-
 import os
 
 from django import forms

modoboa/admin/apps.py

@@ -2,8 +2,6 @@
 
 """AppConfig for admin."""
 
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 from .app_settings import load_admin_settings

modoboa/admin/constants.py

@@ -2,8 +2,6 @@
 
 """Admin constants."""
 
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _
 
 DNSBL_PROVIDERS = [

modoboa/admin/factories.py

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

modoboa/admin/forms/__init__.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from .account import (
     AccountForm, AccountFormGeneral, AccountFormMail, AccountPermissionsForm,
     AccountWizard

modoboa/admin/forms/account.py

@@ -2,8 +2,6 @@
 
 """Forms related to accounts management."""
 
-from __future__ import unicode_literals
-
 from collections import OrderedDict
 from functools import reduce
 

modoboa/admin/forms/alias.py

@@ -2,8 +2,6 @@
 
 """Forms related to aliases management."""
 
-from __future__ import unicode_literals
-
 from collections import OrderedDict
 
 from django import forms

modoboa/admin/forms/domain.py

@@ -2,8 +2,6 @@
 
 """Forms related to domains management."""
 
-from __future__ import unicode_literals
-
 from functools import reduce
 
 from django import forms

modoboa/admin/forms/export.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django import forms
 from django.utils.translation import ugettext_lazy
 

modoboa/admin/forms/forward.py

@@ -2,8 +2,6 @@
 
 """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

@@ -2,8 +2,6 @@
 
 """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

@@ -2,8 +2,6 @@
 
 """Django signal handlers for admin."""
 
-from __future__ import unicode_literals
-
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import signals
 from django.dispatch import receiver

modoboa/admin/lib.py

@@ -2,8 +2,6 @@
 
 """Internal library for admin."""
 
-from __future__ import unicode_literals
-
 import ipaddress
 import logging
 import random

modoboa/admin/management/commands/handle_mailbox_operations.py

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

modoboa/admin/management/commands/modo.py

@@ -2,8 +2,6 @@
 
 """Modoboa main management command."""
 
-from __future__ import unicode_literals
-
 from subcommand.base import SubcommandCommand
 
 from .subcommands._export import ExportCommand

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

@@ -2,8 +2,6 @@
 
 """Django management command to export admin objects."""
 
-from __future__ import unicode_literals
-
 import sys
 
 from django.core.management.base import BaseCommand

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

@@ -2,8 +2,6 @@
 
 """Django management command to import admin objects."""
 
-from __future__ import unicode_literals
-
 import io
 import os
 

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

@@ -2,8 +2,6 @@
 
 """Management command to create DKIM keys."""
 
-from __future__ import print_function, unicode_literals
-
 import os
 
 from django.core.management.base import BaseCommand

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

@@ -2,8 +2,6 @@
 
 """Management command to check defined domains."""
 
-from __future__ import print_function, unicode_literals
-
 import ipaddress
 
 import gevent

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

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

modoboa/admin/migrations/0001_initial.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 

modoboa/admin/migrations/0002_migrate_from_modoboa_admin.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 

modoboa/admin/migrations/0003_auto_20151118_1215.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/0004_auto_20160914_0907.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.9 on 2016-09-14 09:07
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

modoboa/admin/migrations/0005_auto_20161026_1003.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.5 on 2016-10-26 08:03
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/0006_auto_20161104_1900.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.5 on 2016-11-04 18:00
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.utils.timezone
 

modoboa/admin/migrations/0007_auto_20161104_1915.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.5 on 2016-11-04 18:15
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/0008_domain_enable_dns_checks.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.9.12 on 2017-02-06 06:13
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/0009_auto_20170215_0948.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-02-15 08:48
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

modoboa/admin/migrations/0010_auto_20170215_1328.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-02-15 12:28
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/0011_domain_transport.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.7 on 2017-12-20 14:17
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

modoboa/admin/migrations/0012_auto_20180112_1658.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.8 on 2018-01-12 15:58
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/0013_auto_20180124_2311.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.8 on 2018-01-24 23:11
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/0014_auto_20181017_1628.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2018-10-17 14:28
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

modoboa/admin/migrations/__init__.py

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

modoboa/admin/models/__init__.py

@@ -2,8 +2,6 @@
 
 """Admin models."""
 
-from __future__ import unicode_literals
-
 from .alias import Alias, AliasRecipient
 from .base import AdminObject
 from .domain import Domain

modoboa/admin/models/alias.py

@@ -2,8 +2,6 @@
 
 """Models related to aliases management."""
 
-from __future__ import unicode_literals
-
 import hashlib
 import random
 

modoboa/admin/models/base.py

@@ -2,8 +2,6 @@
 
 """Base admin models."""
 
-from __future__ import unicode_literals
-
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
 from django.utils import timezone

modoboa/admin/models/domain.py

@@ -2,8 +2,6 @@
 
 """Models related to domains management."""
 
-from __future__ import unicode_literals
-
 import datetime
 
 from reversion import revisions as reversion

modoboa/admin/models/domain_alias.py

@@ -2,8 +2,6 @@
 
 """Models related to domain aliases management."""
 
-from __future__ import unicode_literals
-
 from reversion import revisions as reversion
 
 from django.contrib.contenttypes.fields import GenericRelation

modoboa/admin/models/mailbox.py

@@ -2,8 +2,6 @@
 
 """Models related to mailboxes management."""
 
-from __future__ import unicode_literals
-
 import os
 import pwd
 

modoboa/admin/models/mxrecord.py

@@ -2,8 +2,6 @@
 
 """MX records storage."""
 
-from __future__ import unicode_literals
-
 import datetime
 
 from django.db import models

modoboa/admin/postfix_maps.py

@@ -2,9 +2,6 @@
 
 """Map file definitions for postfix."""
 
-from __future__ import unicode_literals
-
-
 class DomainsMap(object):
 
     """Map to list all domains."""

modoboa/admin/serializers.py

@@ -2,8 +2,6 @@
 
 """Admin serializers."""
 
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.contrib.auth import password_validation
 from django.core.exceptions import ValidationError

modoboa/admin/signals.py

@@ -2,8 +2,6 @@
 
 """Modoboa admin signals."""
 
-from __future__ import unicode_literals
-
 import django.dispatch
 
 check_extra_account_form = django.dispatch.Signal(

modoboa/admin/templatetags/admin_tags.py

@@ -2,8 +2,6 @@
 
 """Admin extension tags."""
 
-from __future__ import unicode_literals
-
 from functools import reduce
 
 from django import template

modoboa/admin/tests/test_account.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from unittest import skipIf
 
 from django.test import override_settings

modoboa/admin/tests/test_alias.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.urls import reverse
 
 from modoboa.core.models import User

modoboa/admin/tests/test_api.py

@@ -2,10 +2,9 @@
 
 """Admin API related tests."""
 
-from __future__ import unicode_literals
-
 import copy
 import json
+from unittest import mock
 
 import dns.resolver
 
@@ -20,13 +19,6 @@ from modoboa.lib.tests import ModoAPITestCase
 from . import utils
 from .. import factories, models
 
-try:
-    # mock is part of the Python (>= 3.3) standard library
-    from unittest import mock
-except ImportError:
-    # fall back to the mock backport
-    import mock
-
 
 class DomainAPITestCase(ModoAPITestCase):
     """Check API."""

modoboa/admin/tests/test_domain.py

@@ -2,11 +2,10 @@
 
 """Domain related test cases."""
 
-from __future__ import unicode_literals
-
 import os
 import shutil
 import tempfile
+from unittest import mock
 
 import dns.resolver
 from testfixtures import compare
@@ -23,13 +22,6 @@ from . import utils
 from .. import factories
 from ..models import Alias, Domain
 
-try:
-    # mock is part of the Python (>= 3.3) standard library
-    from unittest import mock
-except ImportError:
-    # fall back to the mock backport
-    import mock
-
 
 class DomainTestCase(ModoTestCase):
     """Test case for Domain."""

modoboa/admin/tests/test_domain_alias.py

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

modoboa/admin/tests/test_export.py

@@ -2,8 +2,6 @@
 
 """Export related test cases."""
 
-from __future__ import unicode_literals
-
 import sys
 
 from six.moves import StringIO

modoboa/admin/tests/test_import_.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 import os
+from unittest import mock
 
 import dns.resolver
 
@@ -18,13 +17,6 @@ from . import utils
 from .. import factories
 from ..models import Alias, Domain, DomainAlias
 
-try:
-    # mock is part of the Python (>= 3.3) standard library
-    from unittest import mock
-except ImportError:
-    # fall back to the mock backport
-    import mock
-
 
 class ImportTestCase(ModoTestCase):
 

modoboa/admin/tests/test_mailbox_operations.py

@@ -2,11 +2,10 @@
 
 """Management command tests."""
 
-from __future__ import unicode_literals
-
 import os
 import shutil
 import tempfile
+from unittest import mock
 
 from django.core.management import call_command
 from django.test import override_settings
@@ -15,13 +14,6 @@ from django.urls import reverse
 from modoboa.lib.tests import ModoTestCase
 from .. import factories, models
 
-try:
-    # mock is part of the Python (>= 3.3) standard library
-    from unittest import mock
-except ImportError:
-    # fall back to the mock backport
-    import mock
-
 
 @override_settings(
     DOVECOT_LOOKUP_PATH=["{}/dovecot".format(os.path.dirname(__file__))])

modoboa/admin/tests/test_mapfiles.py

@@ -2,8 +2,6 @@
 
 """Test map files generation."""
 
-from __future__ import unicode_literals
-
 import os
 
 from django.conf import settings

modoboa/admin/tests/test_mx.py

@@ -2,7 +2,7 @@
 
 """DNSBL related tests."""
 
-from __future__ import unicode_literals
+from unittest import mock
 
 import dns.resolver
 from testfixtures import LogCapture
@@ -18,13 +18,6 @@ from . import utils
 from .. import factories, models
 from ..lib import get_domain_mx_list
 
-try:
-    # mock is part of the Python (>= 3.3) standard library
-    from unittest import mock
-except ImportError:
-    # fall back to the mock backport
-    import mock
-
 
 class MXTestCase(ModoTestCase):
     """TestCase for DNSBL related features."""

modoboa/admin/tests/test_password_schemes.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.urls import reverse
 
 from modoboa.core.models import User

modoboa/admin/tests/test_repair.py

@@ -2,8 +2,6 @@
 
 """Repair command tests"""
 
-from __future__ import unicode_literals
-
 from django.core import management
 
 from modoboa.lib.permissions import ObjectAccess, get_object_owner

modoboa/admin/tests/test_user.py

@@ -2,8 +2,6 @@
 
 """User related tests."""
 
-from __future__ import unicode_literals
-
 from django.urls import reverse
 
 from modoboa.core.models import User

modoboa/admin/tests/utils.py

@@ -2,8 +2,6 @@
 
 """Test utilities."""
 
-from __future__ import unicode_literals
-
 import socket
 
 from dns.name import Name

modoboa/admin/urls.py

@@ -2,8 +2,6 @@
 
 """Admin urls."""
 
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 
 from . import views

modoboa/admin/urls_api.py

@@ -2,8 +2,6 @@
 
 """Admin API urls."""
 
-from __future__ import unicode_literals
-
 from rest_framework import routers
 
 from . import api

modoboa/admin/views/__init__.py

@@ -2,8 +2,6 @@
 
 """Shortcuts."""
 
-from __future__ import unicode_literals
-
 from .alias import AliasDetailView
 from .dns import DNSBLDomainDetailView, MXDomainDetailView
 from .domain import DomainDetailView

modoboa/admin/views/alias.py

@@ -2,8 +2,6 @@
 
 """Alias related views."""
 
-from __future__ import unicode_literals
-
 from reversion import revisions as reversion
 
 from django.contrib.auth import mixins as auth_mixins

modoboa/admin/views/dns.py

@@ -2,8 +2,6 @@
 
 """DNSBL related views."""
 
-from __future__ import unicode_literals
-
 from django.contrib.auth import mixins as auth_mixins
 from django.utils.translation import ugettext as _
 from django.views import generic

modoboa/admin/views/domain.py

@@ -2,8 +2,6 @@
 
 """Domain related views."""
 
-from __future__ import unicode_literals
-
 from functools import reduce
 
 from reversion import revisions as reversion

modoboa/admin/views/export.py

@@ -2,8 +2,6 @@
 
 """Export related views."""
 
-from __future__ import unicode_literals
-
 from rfc6266 import build_header
 
 from django.contrib.auth.decorators import (

modoboa/admin/views/identity.py

@@ -2,8 +2,6 @@
 
 """Identity related views."""
 
-from __future__ import unicode_literals
-
 from reversion import revisions as reversion
 
 from django.contrib.auth import mixins as auth_mixins

modoboa/admin/views/import_.py

@@ -2,8 +2,6 @@
 
 """Import related views."""
 
-from __future__ import unicode_literals
-
 import io
 
 from reversion import revisions as reversion

modoboa/admin/views/user.py

@@ -2,8 +2,6 @@
 
 """SimpleUsers views."""
 
-from __future__ import unicode_literals
-
 from reversion import revisions as reversion
 
 from django.contrib.auth.decorators import login_required

modoboa/core/__init__.py

@@ -2,6 +2,4 @@
 
 """App config for core."""
 
-from __future__ import unicode_literals
-
 default_app_config = "modoboa.core.apps.CoreConfig"

modoboa/core/app_settings.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django import forms
 from django.conf import settings
 from django.contrib.auth import password_validation

modoboa/core/apps.py

@@ -2,8 +2,6 @@
 
 """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/checks/__init__.py

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

modoboa/core/checks/settings_checks.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.core.checks import Warning, register
 from django.utils.translation import ugettext as _

modoboa/core/commands/__init__.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import print_function, unicode_literals
-
 import argparse
 import os
 import sys

modoboa/core/commands/deploy.py

@@ -2,8 +2,6 @@
 
 """A shortcut to deploy a fresh modoboa instance."""
 
-from __future__ import print_function, unicode_literals
-
 import codecs
 import getpass
 import os

modoboa/core/commands/help.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import print_function, unicode_literals
-
 import sys
 
 from . import Command

modoboa/core/commands/templates/settings.py.tpl

@@ -9,8 +9,6 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.11/ref/settings/
 """
 
-from __future__ import unicode_literals
-
 from logging.handlers import SysLogHandler
 import os
 {% if devmode %}

modoboa/core/constants.py

@@ -2,8 +2,6 @@
 
 """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

@@ -2,8 +2,6 @@
 
 """Custom context processors."""
 
-from __future__ import unicode_literals
-
 from functools import reduce
 
 from . import signals

modoboa/core/dev_settings.py

@@ -2,8 +2,6 @@
 
 # Development settings
 
-from __future__ import unicode_literals
-
 import os
 
 BOWER_COMPONENTS_ROOT = os.path.join(

modoboa/core/extensions.py

@@ -2,8 +2,6 @@
 
 """Extension management."""
 
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.conf.urls import include, url
 from django.utils.encoding import smart_str

modoboa/core/factories.py

@@ -2,8 +2,6 @@
 
 """Factories for core application."""
 
-from __future__ import unicode_literals
-
 import factory
 
 from django.contrib.auth.models import Group

modoboa/core/forms.py

@@ -2,8 +2,6 @@
 
 """Core forms."""
 
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib.auth import (
     forms as auth_forms, get_user_model, password_validation

modoboa/core/handlers.py

@@ -2,8 +2,6 @@
 
 """Modoboa core signal handlers."""
 
-from __future__ import unicode_literals
-
 import logging
 
 from reversion import revisions as reversion

modoboa/core/loggers.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 import logging
 
 

modoboa/core/management/commands/clean_inactive_accounts.py

@@ -2,8 +2,6 @@
 
 """Inactive accounts cleanup tool."""
 
-from __future__ import print_function, unicode_literals
-
 from dateutil.relativedelta import relativedelta
 from six.moves import input
 

modoboa/core/management/commands/cleanlogs.py

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

modoboa/core/management/commands/communicate_with_public_api.py

@@ -2,8 +2,6 @@
 
 """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

@@ -2,8 +2,6 @@
 
 """Management command to generate/update postfix map files."""
 
-from __future__ import print_function, unicode_literals
-
 import copy
 import hashlib
 import os

modoboa/core/management/commands/load_initial_data.py

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

modoboa/core/management/commands/set_default_site.py

@@ -6,8 +6,6 @@ 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.contrib.sites.models import Site
 from django.core.management.base import BaseCommand, CommandError
 

modoboa/core/middleware.py

@@ -2,8 +2,6 @@
 
 """Core middlewares."""
 
-from __future__ import unicode_literals
-
 from django.utils.deprecation import MiddlewareMixin
 
 from . import models

modoboa/core/migrations/0001_initial.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import django.utils.timezone
 from django.conf import settings

modoboa/core/migrations/0002_delete_extension.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations