sort imports using isort

pip install isort
isort -y
This commit is contained in:
Andrew Fyfe
2018-02-03 00:43:59 +00:00
parent 8a1d5736c9
commit 24a7ca6a9e
122 changed files with 280 additions and 461 deletions
+1 -1
View File
@@ -3,8 +3,8 @@
from __future__ import unicode_literals
import os
import pkg_resources
import pkg_resources
import requests
from requests.exceptions import RequestException
+1 -1
View File
@@ -6,7 +6,7 @@ import smtplib
from django.conf import settings
from modoboa.core.models import populate_callback, User
from modoboa.core.models import User, populate_callback
from modoboa.lib.email_utils import split_mailbox
from modoboa.parameters import tools as param_tools
+2 -2
View File
@@ -6,12 +6,12 @@ from __future__ import unicode_literals
import base64
from cryptography.fernet import Fernet
from django.conf import settings
from django.utils.crypto import get_random_string
from django.utils.encoding import smart_bytes, smart_text
from cryptography.fernet import Fernet
def random_key(length=16):
"""Generate a new key used to encrypt user passwords in session storage."""
+3 -4
View File
@@ -3,12 +3,12 @@
from __future__ import unicode_literals
import email
from email.header import Header
from email.mime.text import MIMEText
from email.utils import make_msgid, formataddr, formatdate, getaddresses
import re
import smtplib
import time
from email.header import Header
from email.mime.text import MIMEText
from email.utils import formataddr, formatdate, getaddresses, make_msgid
import chardet
import lxml.html
@@ -23,7 +23,6 @@ from django.utils.translation import ugettext as _
from modoboa.lib import u2u_decode
from modoboa.lib.exceptions import InternalError
# used by Email()
_RE_REMOVE_EXTRA_WHITESPACE = re.compile(r"\n\s*\n")
_RE_CID = re.compile(r".*[ ]*cid=\"([^\"]*)\".*", re.I)
+1 -2
View File
@@ -5,8 +5,8 @@
from __future__ import unicode_literals
import abc
from collections import OrderedDict
import re
from collections import OrderedDict
from django.forms import TypedChoiceField
from django.forms.fields import Field
@@ -18,7 +18,6 @@ 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(force_str("ABC"), (object,), {})
+2 -2
View File
@@ -38,9 +38,9 @@ from __future__ import unicode_literals
import ldap
from django.conf import settings
from django.utils.translation import ugettext as _
from django.utils.encoding import force_bytes
from django.utils import six
from django.utils.encoding import force_bytes
from django.utils.translation import ugettext as _
from modoboa.core.password_hashers import get_password_hasher
from modoboa.lib.exceptions import InternalError
+1 -1
View File
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
from modoboa.parameters import tools as param_tools
+2 -2
View File
@@ -5,11 +5,11 @@
from __future__ import unicode_literals
from django.http import HttpResponseRedirect
from django.utils.encoding import smart_text
from django.utils.deprecation import MiddlewareMixin
from django.utils.encoding import smart_text
from modoboa.lib.exceptions import ModoboaException
from modoboa.lib import signals as lib_signals
from modoboa.lib.exceptions import ModoboaException
from modoboa.lib.web_utils import (
_render_error, ajax_response, render_to_json_response
)
+1 -2
View File
@@ -6,8 +6,7 @@ from __future__ import unicode_literals
from django.contrib.auth.models import Group, Permission
from django.contrib.contenttypes.models import ContentType
from modoboa.core import constants as core_constants
from modoboa.core import signals as core_signals
from modoboa.core import constants as core_constants, signals as core_signals
from modoboa.core.models import ObjectAccess, User
+1
View File
@@ -1,5 +1,6 @@
from __future__ import unicode_literals
# works in Python 2 & 3
class _Singleton(type):
_instances = {}
+1 -1
View File
@@ -7,9 +7,9 @@ This module extra functions/shortcuts to communicate with the system
from __future__ import unicode_literals
import subprocess
import inspect
import re
import subprocess
def exec_cmd(cmd, sudo_user=None, pinput=None, capture_output=True, **kwargs):
+2 -3
View File
@@ -4,11 +4,10 @@ Form rendering tags.
from __future__ import unicode_literals
from django import forms
from django import template
from django import forms, template
from django.template.loader import render_to_string
from django.utils.encoding import smart_text
from django.utils.safestring import mark_safe
from django.template.loader import render_to_string
from modoboa.lib.form_utils import SeparatorField
+1 -1
View File
@@ -6,7 +6,7 @@ from __future__ import unicode_literals
from datetime import datetime
from django import template
from django.template import Template, Context
from django.template import Context, Template
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext as _
-1
View File
@@ -13,7 +13,6 @@ from rest_framework.authtoken.models import Token
from rest_framework.test import APITestCase
from modoboa.core import models as core_models
from .. import sysutils
try:
+2 -1
View File
@@ -10,7 +10,8 @@ from django.test import SimpleTestCase
from django.utils.encoding import smart_bytes, smart_text
from ..email_utils import (
Email, prepare_addresses, split_address, split_local_part)
Email, prepare_addresses, split_address, split_local_part
)
SAMPLES_DIR = os.path.realpath(
os.path.join(os.path.dirname(__file__), "sample_messages"))
+1 -1
View File
@@ -9,9 +9,9 @@ A stupid (and not accurate) answer to https://bugs.python.org/issue1079.
from __future__ import unicode_literals
import re
from email.header import decode_header, make_header
from email.utils import parseaddr
import re
from django.utils.encoding import smart_text