From 19f84c5daab1edca7f60b2e5c44202e4318316a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksi=20Ha=CC=88kli?= Date: Sun, 10 Feb 2019 22:01:08 +0200 Subject: [PATCH] Clean up and unify imports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use consistent alphabetical import ordering across files - Use axes.conf.settings for internally loading settings Signed-off-by: Aleksi Häkli --- axes/admin.py | 3 +-- axes/checks.py | 2 +- axes/handlers.py | 2 +- axes/tests/test_access_attempt.py | 8 ++++---- axes/tests/test_checks.py | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/axes/admin.py b/axes/admin.py index a6c8eb5..41ec3e2 100644 --- a/axes/admin.py +++ b/axes/admin.py @@ -1,8 +1,7 @@ from django.contrib import admin from django.utils.translation import gettext_lazy as _ -from axes.models import AccessLog -from axes.models import AccessAttempt +from axes.models import AccessAttempt, AccessLog @admin.register(AccessAttempt) diff --git a/axes/checks.py b/axes/checks.py index 2e92af1..c191db4 100644 --- a/axes/checks.py +++ b/axes/checks.py @@ -1,6 +1,6 @@ from django.core.checks import Error, Tags, register -from django.conf import settings +from axes.conf import settings class Messages: diff --git a/axes/handlers.py b/axes/handlers.py index 0845356..7252a47 100644 --- a/axes/handlers.py +++ b/axes/handlers.py @@ -2,13 +2,13 @@ import logging from django.utils.timezone import now -from axes.conf import settings from axes.attempts import get_cache_key from axes.attempts import get_cache_timeout from axes.attempts import get_user_attempts from axes.attempts import is_user_lockable from axes.attempts import ip_in_whitelist from axes.attempts import reset_user_attempts +from axes.conf import settings from axes.exceptions import AxesSignalPermissionDenied from axes.models import AccessLog, AccessAttempt from axes.signals import user_locked_out diff --git a/axes/tests/test_access_attempt.py b/axes/tests/test_access_attempt.py index bcca28f..5eadb2e 100644 --- a/axes/tests/test_access_attempt.py +++ b/axes/tests/test_access_attempt.py @@ -5,15 +5,15 @@ import string import time from unittest.mock import patch -from django.http import HttpRequest -from django.test import TestCase, override_settings -from django.urls import reverse from django.contrib.auth import authenticate from django.contrib.auth.models import User +from django.http import HttpRequest +from django.test import TestCase, override_settings from django.test.client import RequestFactory +from django.urls import reverse -from axes.conf import settings from axes.attempts import get_cache_key +from axes.conf import settings from axes.models import AccessAttempt, AccessLog from axes.signals import user_locked_out from axes.utils import reset diff --git a/axes/tests/test_checks.py b/axes/tests/test_checks.py index 9a954d5..fe58f47 100644 --- a/axes/tests/test_checks.py +++ b/axes/tests/test_checks.py @@ -1,8 +1,8 @@ from django.core.checks import run_checks, Error -from django.conf import settings from django.test import TestCase, override_settings from axes.checks import Messages, Hints, Codes +from axes.conf import settings class CacheCheckTestCase(TestCase):