From b6b26e492f6909c7797709b6a1f3f9d53290275a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksi=20H=C3=A4kli?= Date: Thu, 7 Jan 2021 14:05:48 +0200 Subject: [PATCH] Optimize imports as part of cleanup round --- axes/apps.py | 2 +- axes/attempts.py | 4 ++-- axes/handlers/base.py | 2 +- axes/handlers/cache.py | 2 +- axes/handlers/database.py | 5 ++--- axes/helpers.py | 3 +-- axes/signals.py | 4 ++-- docs/conf.py | 2 +- tests/base.py | 2 +- tests/test_admin.py | 1 - tests/test_attempts.py | 1 - tests/test_backends.py | 1 - tests/test_checks.py | 1 - tests/test_decorators.py | 1 - tests/test_handlers.py | 1 - tests/test_helpers.py | 3 +-- tests/test_logging.py | 1 - tests/test_login.py | 5 ++--- tests/test_management.py | 1 - tests/test_middleware.py | 1 - tests/test_models.py | 1 - tests/test_signals.py | 1 - 22 files changed, 15 insertions(+), 30 deletions(-) diff --git a/axes/apps.py b/axes/apps.py index c128a3c..7d34b56 100644 --- a/axes/apps.py +++ b/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__) diff --git a/axes/attempts.py b/axes/attempts.py index b75d130..a47eb60 100644 --- a/axes/attempts.py +++ b/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__) diff --git a/axes/handlers/base.py b/axes/handlers/base.py index 987c061..b115013 100644 --- a/axes/handlers/base.py +++ b/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 diff --git a/axes/handlers/cache.py b/axes/handlers/cache.py index 7c1b1a0..3f65d44 100644 --- a/axes/handlers/cache.py +++ b/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__) diff --git a/axes/handlers/database.py b/axes/handlers/database.py index 9171ac1..187a089 100644 --- a/axes/handlers/database.py +++ b/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__) diff --git a/axes/helpers.py b/axes/helpers.py index c211582..f0f35f3 100644 --- a/axes/helpers.py +++ b/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 diff --git a/axes/signals.py b/axes/signals.py index 8861557..4a61402 100644 --- a/axes/signals.py +++ b/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__) diff --git a/docs/conf.py b/docs/conf.py index 65425a0..997e35c 100644 --- a/docs/conf.py +++ b/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() diff --git a/tests/base.py b/tests/base.py index 54c9cd3..4dc3407 100644 --- a/tests/base.py +++ b/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): diff --git a/tests/test_admin.py b/tests/test_admin.py index 9fa44d6..be9c35c 100644 --- a/tests/test_admin.py +++ b/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 diff --git a/tests/test_attempts.py b/tests/test_attempts.py index 8fe0967..f532ec2 100644 --- a/tests/test_attempts.py +++ b/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 diff --git a/tests/test_backends.py b/tests/test_backends.py index e681385..5242627 100644 --- a/tests/test_backends.py +++ b/tests/test_backends.py @@ -5,7 +5,6 @@ from axes.exceptions import ( AxesBackendRequestParameterRequired, AxesBackendPermissionDenied, ) - from tests.base import AxesTestCase diff --git a/tests/test_checks.py b/tests/test_checks.py index baece20..594c2a7 100644 --- a/tests/test_checks.py +++ b/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 diff --git a/tests/test_decorators.py b/tests/test_decorators.py index 3c3e331..7de9c26 100644 --- a/tests/test_decorators.py +++ b/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 diff --git a/tests/test_handlers.py b/tests/test_handlers.py index d06578c..7c31d1a 100644 --- a/tests/test_handlers.py +++ b/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 diff --git a/tests/test_helpers.py b/tests/test_helpers.py index 7cd6380..36cd141 100644 --- a/tests/test_helpers.py +++ b/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 diff --git a/tests/test_logging.py b/tests/test_logging.py index e3e7564..5240f95 100644 --- a/tests/test_logging.py +++ b/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 diff --git a/tests/test_login.py b/tests/test_login.py index 45a4dac..3903521 100644 --- a/tests/test_login.py +++ b/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 diff --git a/tests/test_management.py b/tests/test_management.py index 4d42f64..f48aeae 100644 --- a/tests/test_management.py +++ b/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 diff --git a/tests/test_middleware.py b/tests/test_middleware.py index fed40ce..a5c8e41 100644 --- a/tests/test_middleware.py +++ b/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 diff --git a/tests/test_models.py b/tests/test_models.py index f72b7f0..95aade1 100644 --- a/tests/test_models.py +++ b/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 diff --git a/tests/test_signals.py b/tests/test_signals.py index 23030cc..b48443f 100644 --- a/tests/test_signals.py +++ b/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