remove useless builtins imports

modoboa/core/commands/__init__.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 
 from __future__ import print_function
-from builtins import object
 
 import argparse
 import os

modoboa/core/commands/deploy.py

@@ -4,7 +4,6 @@
 
 from __future__ import print_function
 
-from builtins import input
 import getpass
 import os
 import shutil

modoboa/core/extensions.py

@@ -1,7 +1,5 @@
 """Extension management."""
 
-from builtins import object
-
 from django.conf import settings
 from django.conf.urls import include, url
 

modoboa/core/factories.py

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

modoboa/core/forms.py

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

modoboa/core/middleware.py

@@ -1,7 +1,5 @@
 """Core middlewares."""
 
-from builtins import object
-
 from . import models
 
 

modoboa/core/models.py

@@ -1,6 +1,5 @@
 """Core models."""
 
-from builtins import object
 from email.header import Header
 import re
 

modoboa/core/password_hashers/base.py

@@ -5,7 +5,6 @@ Contains weak hashers (the original ones) available with Modoboa.
 """
 
 import base64
-from builtins import object
 import crypt
 import hashlib
 from random import Random

modoboa/core/tests/test_ldap.py

@@ -1,7 +1,5 @@
 """Tests for core application."""
 
-from builtins import object
-
 from unittest import skipIf
 
 from django.core.urlresolvers import reverse

modoboa/lib/email_utils.py

@@ -1,6 +1,5 @@
 # coding: utf-8
 
-from builtins import object
 from email.header import Header, decode_header
 from email.mime.text import MIMEText
 from email.utils import make_msgid, formatdate, parseaddr

modoboa/lib/form_utils.py

@@ -5,7 +5,6 @@
 from __future__ import unicode_literals
 
 import abc
-from builtins import object, range
 from collections import OrderedDict
 import re
 
@@ -22,7 +21,7 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from modoboa.lib.exceptions import BadRequest
 from modoboa.lib.web_utils import render_to_json_response
 
-ABC = abc.ABCMeta("ABC", (object,), {})  # compatible with Python 2 *and* 3
+ABC = abc.ABCMeta(b"ABC", (object,), {})  # compatible with Python 2 *and* 3
 
 
 class WizardStep(object):

modoboa/lib/ldap_utils.py

@@ -33,8 +33,6 @@ Extracted from `this blog
 
 """
 
-from builtins import object
-
 import ldap
 
 from django.conf import settings

modoboa/lib/middleware.py

@@ -2,8 +2,6 @@
 
 """Custom middlewares."""
 
-from builtins import object
-
 from django.http import HttpResponseRedirect
 from django.utils.encoding import smart_text
 

modoboa/lib/paginator.py

@@ -2,8 +2,6 @@
 Custom pagination tools.
 """
 
-from builtins import object
-
 
 class Page(object):
 

modoboa/lib/test_utils.py

@@ -1,7 +1,5 @@
 """Tools for top level testing (ie. when ran by Travis)."""
 
-from builtins import object
-
 import os
 import shutil
 import tempfile

modoboa/lib/tests.py

@@ -1,7 +1,6 @@
 # coding: utf-8
 """Testing utilities."""
 
-from builtins import object
 import json
 
 from django.core import management

modoboa/lib/validators.py

@@ -1,6 +1,5 @@
 """Field validators."""
 
-from builtins import object
 import re
 
 from django.core.exceptions import ValidationError

modoboa/lib/web_utils.py

@@ -4,8 +4,6 @@
 This module contains extra functions/shortcuts used to render HTML.
 """
 
-from builtins import object
-
 import json
 import re
 import sys

modoboa/limits/models.py

@@ -2,8 +2,6 @@
 
 """Models for the limits extensions."""
 
-from builtins import object
-
 from django.conf import settings
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible

modoboa/limits/tests/test_import.py

@@ -1,7 +1,5 @@
 # coding: utf-8
 
-from builtins import range
-
 from django.core.files.base import ContentFile
 from django.core.urlresolvers import reverse
 

modoboa/parameters/tools.py

@@ -1,6 +1,5 @@
 """Parameters management."""
 
-from builtins import object
 import copy
 
 from modoboa.lib import exceptions

modoboa/relaydomains/forms.py

@@ -1,7 +1,5 @@
 """Postfix relay domains extension forms."""
 
-from builtins import object
-
 from django import forms
 from django.core import validators
 from django.utils.translation import ugettext as _

modoboa/relaydomains/models.py

@@ -1,7 +1,5 @@
 """Relay domain related models."""
 
-from builtins import object
-
 from django.db import models
 from django.db.models.manager import Manager
 from django.utils.translation import ugettext as _, ugettext_lazy

modoboa/relaydomains/postfix_maps.py

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

modoboa/relaydomains/tests.py

@@ -1,6 +1,5 @@
 """relaydomains unit tests."""
 
-from builtins import object
 import json
 
 from django.core.files.base import ContentFile

modoboa/relaydomains/views.py

@@ -1,7 +1,5 @@
 """Custom views."""
 
-from builtins import str
-
 from django.contrib.auth.decorators import (
     login_required, permission_required
 )