Optimize imports as part of cleanup round

axes/apps.py

@@ -1,7 +1,7 @@
 from logging import getLogger
-from pkg_resources import get_distribution
 
 from django import apps
+from pkg_resources import get_distribution
 
 log = getLogger(__name__)
 

axes/attempts.py

@@ -1,12 +1,12 @@
-from typing import List
 from logging import getLogger
+from typing import List
 
 from django.db.models import QuerySet
 from django.utils.timezone import datetime, now
 
 from axes.conf import settings
-from axes.models import AccessAttempt
 from axes.helpers import get_client_username, get_client_parameters, get_cool_off
+from axes.models import AccessAttempt
 
 log = getLogger(__name__)
 

axes/handlers/base.py

@@ -1,5 +1,5 @@
-from abc import ABC, abstractmethod
 import re
+from abc import ABC, abstractmethod
 
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch

axes/handlers/cache.py

@@ -2,7 +2,6 @@ from logging import getLogger
 
 from axes.conf import settings
 from axes.handlers.base import AxesBaseHandler, AbstractAxesHandler
-from axes.signals import user_locked_out
 from axes.helpers import (
     get_cache,
     get_cache_timeout,
@@ -12,6 +11,7 @@ from axes.helpers import (
     get_credentials,
     get_failure_limit,
 )
+from axes.signals import user_locked_out
 
 log = getLogger(__name__)
 

axes/handlers/database.py

@@ -11,8 +11,6 @@ from axes.attempts import (
 )
 from axes.conf import settings
 from axes.handlers.base import AxesBaseHandler, AbstractAxesHandler
-from axes.models import AccessLog, AccessAttempt
-from axes.signals import user_locked_out
 from axes.helpers import (
     get_client_str,
     get_client_username,
@@ -20,7 +18,8 @@ from axes.helpers import (
     get_failure_limit,
     get_query_str,
 )
-
+from axes.models import AccessLog, AccessAttempt
+from axes.signals import user_locked_out
 
 log = getLogger(__name__)
 

axes/helpers.py

@@ -5,13 +5,12 @@ from string import Template
 from typing import Callable, Optional, Type, Union
 from urllib.parse import urlencode
 
+import ipware.ip
 from django.core.cache import caches, BaseCache
 from django.http import HttpRequest, HttpResponse, JsonResponse, QueryDict
 from django.shortcuts import render, redirect
 from django.utils.module_loading import import_string
 
-import ipware.ip
-
 from axes.conf import settings
 from axes.models import AccessBase
 

axes/signals.py

@@ -7,11 +7,11 @@ from django.contrib.auth.signals import (
 )
 from django.core.signals import setting_changed
 from django.db.models.signals import post_save, post_delete
-from django.dispatch import receiver
 from django.dispatch import Signal
+from django.dispatch import receiver
 
-from axes.models import AccessAttempt
 from axes.handlers.proxy import AxesProxyHandler
+from axes.models import AccessAttempt
 
 log = getLogger(__name__)
 

docs/conf.py

@@ -7,10 +7,10 @@ More information on the configuration options is available at:
 """
 
 from os import environ
-from pkg_resources import get_distribution
 
 import django
 import sphinx_rtd_theme
+from pkg_resources import get_distribution
 
 environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.settings")
 django.setup()

tests/base.py

@@ -8,7 +8,6 @@ from django.test import TestCase
 from django.urls import reverse
 from django.utils.timezone import now
 
-from axes.utils import reset
 from axes.conf import settings
 from axes.helpers import (
     get_cache,
@@ -21,6 +20,7 @@ from axes.helpers import (
     get_failure_limit,
 )
 from axes.models import AccessAttempt, AccessLog
+from axes.utils import reset
 
 
 def custom_failure_limit(request, credentials):

tests/test_admin.py

@@ -6,7 +6,6 @@ from django.test import override_settings
 
 import axes.admin
 from axes.models import AccessAttempt, AccessLog
-
 from tests.base import AxesTestCase
 
 

tests/test_attempts.py

@@ -7,7 +7,6 @@ from django.utils.timezone import now
 from axes.attempts import get_cool_off_threshold
 from axes.models import AccessAttempt
 from axes.utils import reset, reset_request
-
 from tests.base import AxesTestCase
 
 

tests/test_backends.py

@@ -5,7 +5,6 @@ from axes.exceptions import (
     AxesBackendRequestParameterRequired,
     AxesBackendPermissionDenied,
 )
-
 from tests.base import AxesTestCase
 
 

tests/test_checks.py

@@ -3,7 +3,6 @@ from django.test import override_settings, modify_settings
 
 from axes.backends import AxesBackend
 from axes.checks import Messages, Hints, Codes
-
 from tests.base import AxesTestCase
 
 

tests/test_decorators.py

@@ -3,7 +3,6 @@ from unittest.mock import MagicMock, patch
 from django.http import HttpResponse
 
 from axes.decorators import axes_dispatch, axes_form_invalid
-
 from tests.base import AxesTestCase
 
 

tests/test_handlers.py

@@ -10,7 +10,6 @@ from axes.conf import settings
 from axes.handlers.proxy import AxesProxyHandler
 from axes.helpers import get_client_str
 from axes.models import AccessAttempt, AccessLog
-
 from tests.base import AxesTestCase
 
 

tests/test_helpers.py

@@ -7,7 +7,6 @@ from django.http import JsonResponse, HttpResponseRedirect, HttpResponse, HttpRe
 from django.test import override_settings, RequestFactory
 
 from axes.apps import AppConfig
-from axes.models import AccessAttempt
 from axes.helpers import (
     get_cache_timeout,
     get_client_str,
@@ -25,7 +24,7 @@ from axes.helpers import (
     is_user_attempt_whitelisted,
     toggleable,
 )
-
+from axes.models import AccessAttempt
 from tests.base import AxesTestCase
 
 

tests/test_logging.py

@@ -5,7 +5,6 @@ from django.urls import reverse
 
 from axes.apps import AppConfig
 from axes.models import AccessAttempt, AccessLog
-
 from tests.base import AxesTestCase
 
 

tests/test_login.py

@@ -6,15 +6,14 @@ TODO: Clean up the tests in this module.
 
 from importlib import import_module
 
+from django.contrib.auth import get_user_model, login, logout
 from django.http import HttpRequest
 from django.test import override_settings, TestCase
 from django.urls import reverse
-from django.contrib.auth import get_user_model, login, logout
 
 from axes.conf import settings
-from axes.models import AccessAttempt
 from axes.helpers import get_cache, make_cache_key_list
-
+from axes.models import AccessAttempt
 from tests.base import AxesTestCase
 
 

tests/test_management.py

@@ -5,7 +5,6 @@ from django.core.management import call_command
 from django.utils import timezone
 
 from axes.models import AccessAttempt, AccessLog
-
 from tests.base import AxesTestCase
 
 

tests/test_middleware.py

@@ -2,7 +2,6 @@ from django.http import HttpResponse, HttpRequest
 from django.test import override_settings
 
 from axes.middleware import AxesMiddleware
-
 from tests.base import AxesTestCase
 
 

tests/test_models.py

@@ -5,7 +5,6 @@ from django.db.migrations.executor import MigrationExecutor
 from django.db.migrations.state import ProjectState
 
 from axes.models import AccessAttempt, AccessLog
-
 from tests.base import AxesTestCase
 
 

tests/test_signals.py

@@ -1,7 +1,6 @@
 from unittest.mock import MagicMock
 
 from axes.signals import user_locked_out
-
 from tests.base import AxesTestCase