From 4232d685bd6e2016fd6a0cbfe401582a31e693f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alieh=20Ryma=C5=A1e=C5=ADski?= Date: Thu, 24 Jun 2021 14:33:30 +0300 Subject: [PATCH] Apply isort to the code base --- auditlog/admin.py | 8 ++-- auditlog/context.py | 4 +- auditlog/count.py | 2 +- auditlog/diff.py | 2 +- auditlog/filters.py | 2 +- auditlog/migrations/0001_initial.py | 2 +- .../0002_auto_support_long_primary_keys.py | 2 +- .../migrations/0003_logentry_remote_addr.py | 2 +- .../0004_logentry_detailed_object_repr.py | 2 +- ...5_logentry_additional_data_verbose_name.py | 2 +- auditlog/models.py | 4 +- auditlog/registry.py | 6 +-- auditlog_tests/models.py | 4 +- auditlog_tests/tests.py | 47 ++++++++++--------- auditlog_tests/urls.py | 1 - 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/auditlog/admin.py b/auditlog/admin.py index 512f2f7..942955b 100644 --- a/auditlog/admin.py +++ b/auditlog/admin.py @@ -4,14 +4,14 @@ from django.core.paginator import Paginator from django.utils.functional import cached_property from auditlog.count import limit_query_time -from auditlog.models import LogEntry -from auditlog.mixins import LogEntryAdminMixin from auditlog.filters import ( - ShortActorFilter, - ResourceTypeFilter, FieldFilter, + ResourceTypeFilter, + ShortActorFilter, get_timestamp_filter, ) +from auditlog.mixins import LogEntryAdminMixin +from auditlog.models import LogEntry class TimeLimitedPaginator(Paginator): diff --git a/auditlog/context.py b/auditlog/context.py index bf95d46..251a240 100644 --- a/auditlog/context.py +++ b/auditlog/context.py @@ -1,7 +1,7 @@ import contextlib -from functools import partial -import time import threading +import time +from functools import partial from django.contrib.auth import get_user_model from django.db.models.signals import pre_save diff --git a/auditlog/count.py b/auditlog/count.py index b135122..7c78e5d 100644 --- a/auditlog/count.py +++ b/auditlog/count.py @@ -1,4 +1,4 @@ -from django.db import connection, transaction, OperationalError +from django.db import OperationalError, connection, transaction def limit_query_time(timeout, default=None): diff --git a/auditlog/diff.py b/auditlog/diff.py index 833db01..a7b30dc 100644 --- a/auditlog/diff.py +++ b/auditlog/diff.py @@ -1,6 +1,6 @@ from django.conf import settings from django.core.exceptions import ObjectDoesNotExist -from django.db.models import Model, NOT_PROVIDED, DateTimeField +from django.db.models import NOT_PROVIDED, DateTimeField, Model from django.utils import timezone from django.utils.encoding import smart_str diff --git a/auditlog/filters.py b/auditlog/filters.py index 5dff491..e439734 100644 --- a/auditlog/filters.py +++ b/auditlog/filters.py @@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.fields import JSONField from django.db import connection from django.db.models import Value -from django.db.models.functions import Concat, Cast +from django.db.models.functions import Cast, Concat from auditlog.registry import auditlog diff --git a/auditlog/migrations/0001_initial.py b/auditlog/migrations/0001_initial.py index 0e2bd55..22b1ee4 100644 --- a/auditlog/migrations/0001_initial.py +++ b/auditlog/migrations/0001_initial.py @@ -1,6 +1,6 @@ -from django.db import models, migrations import django.db.models.deletion from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/auditlog/migrations/0002_auto_support_long_primary_keys.py b/auditlog/migrations/0002_auto_support_long_primary_keys.py index 01c7d6e..e767b92 100644 --- a/auditlog/migrations/0002_auto_support_long_primary_keys.py +++ b/auditlog/migrations/0002_auto_support_long_primary_keys.py @@ -1,4 +1,4 @@ -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/auditlog/migrations/0003_logentry_remote_addr.py b/auditlog/migrations/0003_logentry_remote_addr.py index 706dc4f..c363e82 100644 --- a/auditlog/migrations/0003_logentry_remote_addr.py +++ b/auditlog/migrations/0003_logentry_remote_addr.py @@ -1,4 +1,4 @@ -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/auditlog/migrations/0004_logentry_detailed_object_repr.py b/auditlog/migrations/0004_logentry_detailed_object_repr.py index cd194b2..a1c77a6 100644 --- a/auditlog/migrations/0004_logentry_detailed_object_repr.py +++ b/auditlog/migrations/0004_logentry_detailed_object_repr.py @@ -1,5 +1,5 @@ -from django.db import migrations import jsonfield.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/auditlog/migrations/0005_logentry_additional_data_verbose_name.py b/auditlog/migrations/0005_logentry_additional_data_verbose_name.py index f04e131..9a59350 100644 --- a/auditlog/migrations/0005_logentry_additional_data_verbose_name.py +++ b/auditlog/migrations/0005_logentry_additional_data_verbose_name.py @@ -1,5 +1,5 @@ -from django.db import migrations import jsonfield.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/auditlog/models.py b/auditlog/models.py index 3dda7ed..e0ad4dc 100644 --- a/auditlog/models.py +++ b/auditlog/models.py @@ -7,8 +7,8 @@ from django.conf import settings from django.contrib.contenttypes.fields import GenericRelation from django.contrib.contenttypes.models import ContentType from django.core.exceptions import FieldDoesNotExist -from django.db import models, DEFAULT_DB_ALIAS -from django.db.models import QuerySet, Q +from django.db import DEFAULT_DB_ALIAS, models +from django.db.models import Q, QuerySet from django.utils import formats, timezone from django.utils.encoding import smart_str from django.utils.translation import gettext_lazy as _ diff --git a/auditlog/registry.py b/auditlog/registry.py index 6f9df97..19db36f 100644 --- a/auditlog/registry.py +++ b/auditlog/registry.py @@ -1,8 +1,8 @@ -from typing import Dict, Callable, Optional, List, Tuple +from typing import Callable, Dict, List, Optional, Tuple from django.db.models import Model from django.db.models.base import ModelBase -from django.db.models.signals import pre_save, post_save, post_delete, ModelSignal +from django.db.models.signals import ModelSignal, post_delete, post_save, pre_save DispatchUID = Tuple[int, str, int] @@ -19,7 +19,7 @@ class AuditlogModelRegistry(object): delete: bool = True, custom: Optional[Dict[ModelSignal, Callable]] = None, ): - from auditlog.receivers import log_create, log_update, log_delete + from auditlog.receivers import log_create, log_delete, log_update self._registry = {} self._signals = {} diff --git a/auditlog_tests/models.py b/auditlog_tests/models.py index 86b135d..2c0e72f 100644 --- a/auditlog_tests/models.py +++ b/auditlog_tests/models.py @@ -2,11 +2,11 @@ import uuid from django.contrib.postgres.fields import ArrayField from django.db import models +from multiselectfield import MultiSelectField + from auditlog.models import AuditlogHistoryField from auditlog.registry import auditlog -from multiselectfield import MultiSelectField - @auditlog.register() class SimpleModel(models.Model): diff --git a/auditlog_tests/tests.py b/auditlog_tests/tests.py index 0817e24..36a15af 100644 --- a/auditlog_tests/tests.py +++ b/auditlog_tests/tests.py @@ -1,32 +1,33 @@ import datetime -from django.conf import settings -from django.contrib.auth.models import User, AnonymousUser -from django.db.models.signals import pre_save -from django.test import TestCase, RequestFactory -from django.utils import dateformat, formats, timezone -from dateutil.tz import gettz + import mock +from auditlog_tests.models import ( + AdditionalDataIncludedModel, + AltPrimaryKeyModel, + CharfieldTextfieldModel, + ChoicesFieldModel, + DateTimeFieldModel, + ManyRelatedModel, + NoDeleteHistoryModel, + PostgresArrayFieldModel, + ProxyModel, + RelatedModel, + SimpleExcludeModel, + SimpleIncludeModel, + SimpleMappingModel, + SimpleModel, + UUIDPrimaryKeyModel, +) +from dateutil.tz import gettz +from django.conf import settings +from django.contrib.auth.models import AnonymousUser, User +from django.db.models.signals import pre_save +from django.test import RequestFactory, TestCase +from django.utils import dateformat, formats, timezone from auditlog.middleware import AuditlogMiddleware from auditlog.models import LogEntry from auditlog.registry import auditlog -from auditlog_tests.models import ( - SimpleModel, - AltPrimaryKeyModel, - UUIDPrimaryKeyModel, - ProxyModel, - SimpleIncludeModel, - SimpleExcludeModel, - SimpleMappingModel, - RelatedModel, - ManyRelatedModel, - AdditionalDataIncludedModel, - DateTimeFieldModel, - ChoicesFieldModel, - CharfieldTextfieldModel, - PostgresArrayFieldModel, - NoDeleteHistoryModel, -) class SimpleModelTest(TestCase): diff --git a/auditlog_tests/urls.py b/auditlog_tests/urls.py index 60bf9ac..32fe1ae 100644 --- a/auditlog_tests/urls.py +++ b/auditlog_tests/urls.py @@ -1,7 +1,6 @@ from django.conf.urls import url from django.contrib import admin - urlpatterns = [ url(r"^admin/", admin.site.urls), ]