Cleaned up imports

allauth/account/adapter.py

@@ -1,38 +1,46 @@
 from __future__ import unicode_literals
 
+import hashlib
 import json
 import time
 import warnings
-import hashlib
 
 from django import forms
 from django.conf import settings
 from django.contrib import messages
-from django.contrib.auth import login as django_login, get_backends
-from django.contrib.auth import logout as django_logout, authenticate
+from django.contrib.auth import (
+    authenticate,
+    get_backends,
+    login as django_login,
+    logout as django_logout,
+)
 from django.contrib.auth.models import AbstractUser
 from django.core.cache import cache
-from django.core.mail import EmailMultiAlternatives, EmailMessage
-from django.http import HttpResponse
-from django.http import HttpResponseRedirect
-from django.template.loader import render_to_string
+from django.core.mail import EmailMessage, EmailMultiAlternatives
+from django.http import HttpResponse, HttpResponseRedirect
 from django.template import TemplateDoesNotExist
+from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 
+from . import app_settings
+from ..compat import is_authenticated, reverse, validate_password
+from ..utils import (
+    build_absolute_uri,
+    email_address_exists,
+    generate_unique_username,
+    get_current_site,
+    get_user_model,
+    import_attribute,
+    resolve_url,
+)
+
+
 try:
     from django.utils.encoding import force_text
 except ImportError:
     from django.utils.encoding import force_unicode as force_text
 
-from ..compat import is_authenticated, reverse, validate_password
-from ..utils import (build_absolute_uri, get_current_site,
-                     generate_unique_username,
-                     get_user_model, import_attribute,
-                     resolve_url, email_address_exists)
-
-from . import app_settings
-
 
 class DefaultAccountAdapter(object):
 

allauth/account/admin.py

@@ -1,9 +1,9 @@
 import django
 from django.contrib import admin
 
-from .models import EmailConfirmation, EmailAddress
-from .adapter import get_adapter
 from . import app_settings
+from .adapter import get_adapter
+from .models import EmailAddress, EmailConfirmation
 
 
 class EmailAddressAdmin(admin.ModelAdmin):

allauth/account/app_settings.py

@@ -326,6 +326,8 @@ def USERNAME_VALIDATORS(self):
 # Ugly? Guido recommends this himself ...
 # http://mail.python.org/pipermail/python-ideas/2012-May/014969.html
 import sys  # noqa
+
+
 app_settings = AppSettings('ACCOUNT_')
 app_settings.__name__ = __name__
 sys.modules[__name__] = app_settings

allauth/account/auth_backends.py

@@ -1,11 +1,9 @@
 from django.contrib.auth.backends import ModelBackend
 
+from . import app_settings
 from ..utils import get_user_model
-from .utils import (filter_users_by_email,
-                    filter_users_by_username)
-
 from .app_settings import AuthenticationMethod
-from . import app_settings
+from .utils import filter_users_by_email, filter_users_by_username
 
 
 class AuthenticationBackend(ModelBackend):

allauth/account/decorators.py

@@ -1,9 +1,8 @@
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 
 from .models import EmailAddress
-
 from .utils import send_email_confirmation
 
 

allauth/account/forms.py

@@ -4,25 +4,31 @@
 from importlib import import_module
 
 from django import forms
-from django.core import exceptions
-from django.utils.translation import pgettext, ugettext_lazy as _, ugettext
-from django.core import validators
 from django.contrib.auth.tokens import default_token_generator
+from django.core import exceptions, validators
+from django.utils.translation import pgettext, ugettext, ugettext_lazy as _
 
-from ..compat import reverse
-from ..utils import (set_form_field_order,
-                     build_absolute_uri,
-                     get_username_max_length,
-                     get_current_site)
-
-from .models import EmailAddress
-from .utils import (perform_login, setup_user_email, url_str_to_user_pk,
-                    user_username, user_pk_to_url_str, filter_users_by_email,
-                    get_user_model,
-                    user_email)
-from .app_settings import AuthenticationMethod
 from . import app_settings
+from ..compat import reverse
+from ..utils import (
+    build_absolute_uri,
+    get_current_site,
+    get_username_max_length,
+    set_form_field_order,
+)
 from .adapter import get_adapter
+from .app_settings import AuthenticationMethod
+from .models import EmailAddress
+from .utils import (
+    filter_users_by_email,
+    get_user_model,
+    perform_login,
+    setup_user_email,
+    url_str_to_user_pk,
+    user_email,
+    user_pk_to_url_str,
+    user_username,
+)
 
 
 class PasswordVerificationMixin(object):

allauth/account/management/commands/account_unsetmultipleprimaryemails.py

@@ -1,9 +1,9 @@
 from django.core.management.base import BaseCommand
 from django.db.models import Count
 
+from allauth.account.models import EmailAddress
 from allauth.account.utils import user_email
 from allauth.utils import get_user_model
-from allauth.account.models import EmailAddress
 
 
 class Command(BaseCommand):

allauth/account/managers.py

@@ -1,8 +1,8 @@
 from datetime import timedelta
 
-from django.utils import timezone
 from django.db import models
 from django.db.models import Q
+from django.utils import timezone
 
 from . import app_settings
 

allauth/account/models.py

@@ -3,20 +3,17 @@
 import datetime
 
 from django.core import signing
-from django.db import models
-from django.db import transaction
-from django.utils.translation import ugettext_lazy as _
+from django.db import models, transaction
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.crypto import get_random_string
+from django.utils.encoding import python_2_unicode_compatible
+from django.utils.translation import ugettext_lazy as _
 
+from . import app_settings, signals
 from .. import app_settings as allauth_app_settings
-from . import app_settings
-from . import signals
-
-from .utils import user_email
-from .managers import EmailAddressManager, EmailConfirmationManager
 from .adapter import get_adapter
+from .managers import EmailAddressManager, EmailConfirmationManager
+from .utils import user_email
 
 
 @python_2_unicode_compatible

allauth/account/signals.py

@@ -1,5 +1,6 @@
 from django.dispatch import Signal
 
+
 user_logged_in = Signal(providing_args=["request", "user"])
 
 # Typically followed by `user_logged_in` (unless, e-mail verification kicks in)

allauth/account/templatetags/account.py

@@ -2,6 +2,7 @@
 
 from allauth.account.utils import user_display
 
+
 register = template.Library()
 
 

allauth/account/templatetags/account_tags.py

@@ -1,6 +1,7 @@
 import warnings
 
+from .account import *  # noqa
+
+
 warnings.warn("{% load account_tags %} is deprecated, use {% load account %}",
               DeprecationWarning)
-
-from .account import *  # noqa

allauth/account/tests.py

@@ -1,45 +1,43 @@
 from __future__ import absolute_import
+
 import json
+import unittest
 import uuid
-
 from datetime import timedelta
 
 import django
-from django.utils.timezone import now
-from django.test.utils import override_settings
 from django.conf import settings
-from django.test.client import Client
-from django.core import mail
-from django.test.client import RequestFactory
-from django.contrib.auth.models import AnonymousUser, AbstractUser
-from django.db import models
+from django.contrib.auth.models import AbstractUser, AnonymousUser
+from django.core import mail, validators
 from django.core.exceptions import ValidationError
-from django.core import validators
-import unittest
+from django.db import models
+from django.test.client import Client, RequestFactory
+from django.test.utils import override_settings
+from django.utils.timezone import now
 
-from allauth.tests import TestCase, patch
 from allauth.account.forms import BaseSignupForm
 from allauth.account.models import (
     EmailAddress,
     EmailConfirmation,
-    EmailConfirmationHMAC)
-
+    EmailConfirmationHMAC,
+)
+from allauth.tests import TestCase, patch
 from allauth.utils import (
     get_current_site,
     get_user_model,
-    get_username_max_length)
-
-from ..compat import is_authenticated, reverse
+    get_username_max_length,
+)
 
 from . import app_settings
-
-from .auth_backends import AuthenticationBackend
+from ..compat import is_authenticated, reverse
 from .adapter import get_adapter
+from .auth_backends import AuthenticationBackend
 from .utils import (
     filter_users_by_username,
     url_str_to_user_pk,
     user_pk_to_url_str,
-    user_username)
+    user_username,
+)
 
 
 test_username_validators = [

allauth/account/urls.py

@@ -2,6 +2,7 @@
 
 from . import views
 
+
 urlpatterns = [
     url(r"^signup/$", views.signup, name="account_signup"),
     url(r"^login/$", views.login, name="account_login"),

allauth/account/utils.py

@@ -1,17 +1,29 @@
 from datetime import timedelta
+
+from django.conf import settings
 from django.contrib import messages
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import Q
-from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.utils import six
-from django.utils.http import urlencode
-from django.utils.http import int_to_base36, base36_to_int
+from django.utils.http import base36_to_int, int_to_base36, urlencode
 from django.utils.timezone import now
-from django.core.exceptions import ValidationError
 
 from allauth.compat import OrderedDict
 
+from . import app_settings, signals
+from ..exceptions import ImmediateHttpResponse
+from ..utils import (
+    get_request_param,
+    get_user_model,
+    import_callable,
+    valid_email_or_none,
+)
+from .adapter import get_adapter
+from .app_settings import EmailVerificationMethod
+
+
 try:
     from django.contrib.auth import update_session_auth_hash
 except ImportError:
@@ -22,16 +34,6 @@
 except ImportError:
     from django.utils.encoding import force_unicode as force_text
 
-from ..exceptions import ImmediateHttpResponse
-from ..utils import (import_callable, valid_email_or_none,
-                     get_user_model, get_request_param)
-
-from . import signals
-
-from .app_settings import EmailVerificationMethod
-from . import app_settings
-from .adapter import get_adapter
-
 
 def get_next_redirect_url(request, redirect_field_name="next"):
     """