From 9a5c293d520bb925f55d8edee479b7e2cb2ec542 Mon Sep 17 00:00:00 2001 From: Arthur Vuillard Date: Thu, 11 May 2017 00:02:00 +0200 Subject: [PATCH] remove useless builtins imports --- modoboa/core/commands/__init__.py | 1 - modoboa/core/commands/deploy.py | 1 - modoboa/core/extensions.py | 2 -- modoboa/core/factories.py | 2 -- modoboa/core/forms.py | 2 -- modoboa/core/middleware.py | 2 -- modoboa/core/models.py | 1 - modoboa/core/password_hashers/base.py | 1 - modoboa/core/tests/test_ldap.py | 2 -- modoboa/lib/email_utils.py | 1 - modoboa/lib/form_utils.py | 3 +-- modoboa/lib/ldap_utils.py | 2 -- modoboa/lib/middleware.py | 2 -- modoboa/lib/paginator.py | 2 -- modoboa/lib/test_utils.py | 2 -- modoboa/lib/tests.py | 1 - modoboa/lib/validators.py | 1 - modoboa/lib/web_utils.py | 2 -- modoboa/limits/models.py | 2 -- modoboa/limits/tests/test_import.py | 2 -- modoboa/parameters/tools.py | 1 - modoboa/relaydomains/forms.py | 2 -- modoboa/relaydomains/models.py | 2 -- modoboa/relaydomains/postfix_maps.py | 2 -- modoboa/relaydomains/tests.py | 1 - modoboa/relaydomains/views.py | 2 -- 26 files changed, 1 insertion(+), 43 deletions(-) diff --git a/modoboa/core/commands/__init__.py b/modoboa/core/commands/__init__.py index 3f582aaee..1a53c3120 100644 --- a/modoboa/core/commands/__init__.py +++ b/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 diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index 04457e013..61eb4eab8 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -4,7 +4,6 @@ from __future__ import print_function -from builtins import input import getpass import os import shutil diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py index d6641c611..3df7f0fea 100644 --- a/modoboa/core/extensions.py +++ b/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 diff --git a/modoboa/core/factories.py b/modoboa/core/factories.py index a88bb24fc..c375d09c5 100644 --- a/modoboa/core/factories.py +++ b/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 diff --git a/modoboa/core/forms.py b/modoboa/core/forms.py index 95e1b8398..26dd71847 100644 --- a/modoboa/core/forms.py +++ b/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 diff --git a/modoboa/core/middleware.py b/modoboa/core/middleware.py index 7ebd3bdb8..c1463be56 100644 --- a/modoboa/core/middleware.py +++ b/modoboa/core/middleware.py @@ -1,7 +1,5 @@ """Core middlewares.""" -from builtins import object - from . import models diff --git a/modoboa/core/models.py b/modoboa/core/models.py index bd32a128f..66b1ea954 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -1,6 +1,5 @@ """Core models.""" -from builtins import object from email.header import Header import re diff --git a/modoboa/core/password_hashers/base.py b/modoboa/core/password_hashers/base.py index 67c1d0e4b..b9050f4ca 100644 --- a/modoboa/core/password_hashers/base.py +++ b/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 diff --git a/modoboa/core/tests/test_ldap.py b/modoboa/core/tests/test_ldap.py index d87e175b6..182fae6dd 100644 --- a/modoboa/core/tests/test_ldap.py +++ b/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 diff --git a/modoboa/lib/email_utils.py b/modoboa/lib/email_utils.py index 22b8e414f..50790187c 100644 --- a/modoboa/lib/email_utils.py +++ b/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 diff --git a/modoboa/lib/form_utils.py b/modoboa/lib/form_utils.py index 7d67c8bb7..e1c85a416 100644 --- a/modoboa/lib/form_utils.py +++ b/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): diff --git a/modoboa/lib/ldap_utils.py b/modoboa/lib/ldap_utils.py index 89789f34c..2988ee889 100644 --- a/modoboa/lib/ldap_utils.py +++ b/modoboa/lib/ldap_utils.py @@ -33,8 +33,6 @@ Extracted from `this blog """ -from builtins import object - import ldap from django.conf import settings diff --git a/modoboa/lib/middleware.py b/modoboa/lib/middleware.py index e9193c0b3..ee2f074c3 100644 --- a/modoboa/lib/middleware.py +++ b/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 diff --git a/modoboa/lib/paginator.py b/modoboa/lib/paginator.py index 34120ec82..79ecf94dd 100644 --- a/modoboa/lib/paginator.py +++ b/modoboa/lib/paginator.py @@ -2,8 +2,6 @@ Custom pagination tools. """ -from builtins import object - class Page(object): diff --git a/modoboa/lib/test_utils.py b/modoboa/lib/test_utils.py index 22f48ee2b..e4bb1e4d9 100644 --- a/modoboa/lib/test_utils.py +++ b/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 diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py index 7fe724c88..c2544717c 100644 --- a/modoboa/lib/tests.py +++ b/modoboa/lib/tests.py @@ -1,7 +1,6 @@ # coding: utf-8 """Testing utilities.""" -from builtins import object import json from django.core import management diff --git a/modoboa/lib/validators.py b/modoboa/lib/validators.py index 54dbd2180..83c569ad1 100644 --- a/modoboa/lib/validators.py +++ b/modoboa/lib/validators.py @@ -1,6 +1,5 @@ """Field validators.""" -from builtins import object import re from django.core.exceptions import ValidationError diff --git a/modoboa/lib/web_utils.py b/modoboa/lib/web_utils.py index 8ac234a76..b7607d75c 100644 --- a/modoboa/lib/web_utils.py +++ b/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 diff --git a/modoboa/limits/models.py b/modoboa/limits/models.py index f93f0afd6..0986eb756 100644 --- a/modoboa/limits/models.py +++ b/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 diff --git a/modoboa/limits/tests/test_import.py b/modoboa/limits/tests/test_import.py index f07bc99b4..e6702a773 100644 --- a/modoboa/limits/tests/test_import.py +++ b/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 diff --git a/modoboa/parameters/tools.py b/modoboa/parameters/tools.py index eb11d845d..8d3b1131f 100644 --- a/modoboa/parameters/tools.py +++ b/modoboa/parameters/tools.py @@ -1,6 +1,5 @@ """Parameters management.""" -from builtins import object import copy from modoboa.lib import exceptions diff --git a/modoboa/relaydomains/forms.py b/modoboa/relaydomains/forms.py index 38007e4de..1da259ebb 100644 --- a/modoboa/relaydomains/forms.py +++ b/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 _ diff --git a/modoboa/relaydomains/models.py b/modoboa/relaydomains/models.py index ba3b31041..715e4ba3f 100644 --- a/modoboa/relaydomains/models.py +++ b/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 diff --git a/modoboa/relaydomains/postfix_maps.py b/modoboa/relaydomains/postfix_maps.py index 2372b05c0..e91444e7f 100644 --- a/modoboa/relaydomains/postfix_maps.py +++ b/modoboa/relaydomains/postfix_maps.py @@ -1,7 +1,5 @@ """Map file definitions for postfix.""" -from builtins import object - class RelayDomainsMap(object): diff --git a/modoboa/relaydomains/tests.py b/modoboa/relaydomains/tests.py index dd256f373..672c5dda5 100644 --- a/modoboa/relaydomains/tests.py +++ b/modoboa/relaydomains/tests.py @@ -1,6 +1,5 @@ """relaydomains unit tests.""" -from builtins import object import json from django.core.files.base import ContentFile diff --git a/modoboa/relaydomains/views.py b/modoboa/relaydomains/views.py index 64c8372a4..6e30d2ce9 100644 --- a/modoboa/relaydomains/views.py +++ b/modoboa/relaydomains/views.py @@ -1,7 +1,5 @@ """Custom views.""" -from builtins import str - from django.contrib.auth.decorators import ( login_required, permission_required )