From f84d38db26080b136a9ef3605caf9bf242ef8220 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:18:58 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../migrations/0015_alter_logentry_changes.py | 2 +- auditlog/models.py | 14 +++++------ auditlog/registry.py | 25 +++++++++---------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/auditlog/migrations/0015_alter_logentry_changes.py b/auditlog/migrations/0015_alter_logentry_changes.py index fb52a6b..e2892ae 100644 --- a/auditlog/migrations/0015_alter_logentry_changes.py +++ b/auditlog/migrations/0015_alter_logentry_changes.py @@ -5,7 +5,7 @@ from django.conf import settings from django.db import migrations, models -def two_step_migrations() -> List: +def two_step_migrations() -> list: if settings.AUDITLOG_TWO_STEP_MIGRATION: return [ migrations.RenameField( diff --git a/auditlog/models.py b/auditlog/models.py index 1ae8dbc..eeb41ca 100644 --- a/auditlog/models.py +++ b/auditlog/models.py @@ -275,8 +275,8 @@ class LogEntryManager(models.Manager): return instance_copy def _get_applicable_model_fields( - self, instance, model_fields: Dict[str, List[str]] - ) -> List[str]: + self, instance, model_fields: dict[str, list[str]] + ) -> list[str]: include_fields = model_fields["include_fields"] exclude_fields = model_fields["exclude_fields"] all_field_names = [field.name for field in instance._meta.fields] @@ -287,8 +287,8 @@ class LogEntryManager(models.Manager): return list(set(include_fields or all_field_names).difference(exclude_fields)) def _mask_serialized_fields( - self, data: Dict[str, Any], mask_fields: List[str] - ) -> Dict[str, Any]: + self, data: dict[str, Any], mask_fields: list[str] + ) -> dict[str, Any]: all_field_data = data.pop("fields") masked_field_data = {} @@ -592,8 +592,8 @@ class AuditlogHistoryField(GenericRelation): changes_func = None -def _changes_func() -> Callable[[LogEntry], Dict]: - def json_then_text(instance: LogEntry) -> Dict: +def _changes_func() -> Callable[[LogEntry], dict]: + def json_then_text(instance: LogEntry) -> dict: if instance.changes: return instance.changes elif instance.changes_text: @@ -601,7 +601,7 @@ def _changes_func() -> Callable[[LogEntry], Dict]: return json.loads(instance.changes_text) return {} - def default(instance: LogEntry) -> Dict: + def default(instance: LogEntry) -> dict: return instance.changes or {} if settings.AUDITLOG_USE_TEXT_CHANGES_IF_JSON_IS_NOT_PRESENT: diff --git a/auditlog/registry.py b/auditlog/registry.py index 3f1f8f3..34ed632 100644 --- a/auditlog/registry.py +++ b/auditlog/registry.py @@ -3,14 +3,13 @@ from collections import defaultdict from typing import ( Any, Callable, - Collection, Dict, - Iterable, List, Optional, Tuple, Union, ) +from collections.abc import Collection, Iterable from django.apps import apps from django.db.models import ManyToManyField, Model @@ -26,7 +25,7 @@ from django.db.models.signals import ( from auditlog.conf import settings from auditlog.signals import accessed -DispatchUID = Tuple[int, int, int] +DispatchUID = tuple[int, int, int] class AuditLogRegistrationError(Exception): @@ -47,7 +46,7 @@ class AuditlogModelRegistry: delete: bool = True, access: bool = True, m2m: bool = True, - custom: Optional[Dict[ModelSignal, Callable]] = None, + custom: Optional[dict[ModelSignal, Callable]] = None, ): from auditlog.receivers import log_access, log_create, log_delete, log_update @@ -71,13 +70,13 @@ class AuditlogModelRegistry: def register( self, model: ModelBase = None, - include_fields: Optional[List[str]] = None, - exclude_fields: Optional[List[str]] = None, - mapping_fields: Optional[Dict[str, str]] = None, - mask_fields: Optional[List[str]] = None, + include_fields: Optional[list[str]] = None, + exclude_fields: Optional[list[str]] = None, + mapping_fields: Optional[dict[str, str]] = None, + mask_fields: Optional[list[str]] = None, m2m_fields: Optional[Collection[str]] = None, serialize_data: bool = False, - serialize_kwargs: Optional[Dict[str, Any]] = None, + serialize_kwargs: Optional[dict[str, Any]] = None, serialize_auditlog_fields_only: bool = False, ): """ @@ -169,7 +168,7 @@ class AuditlogModelRegistry: else: self._disconnect_signals(model) - def get_models(self) -> List[ModelBase]: + def get_models(self) -> list[ModelBase]: return list(self._registry.keys()) def get_model_fields(self, model: ModelBase): @@ -235,7 +234,7 @@ class AuditlogModelRegistry: """Generate a dispatch_uid which is unique for a combination of self, signal, and receiver.""" return id(self), id(signal), id(receiver) - def _get_model_classes(self, app_model: str) -> List[ModelBase]: + def _get_model_classes(self, app_model: str) -> list[ModelBase]: try: try: app_label, model_name = app_model.split(".") @@ -247,7 +246,7 @@ class AuditlogModelRegistry: def _get_exclude_models( self, exclude_tracking_models: Iterable[str] - ) -> List[ModelBase]: + ) -> list[ModelBase]: exclude_models = [ model for app_model in tuple(exclude_tracking_models) @@ -256,7 +255,7 @@ class AuditlogModelRegistry: ] return exclude_models - def _register_models(self, models: Iterable[Union[str, Dict[str, Any]]]) -> None: + def _register_models(self, models: Iterable[Union[str, dict[str, Any]]]) -> None: models = copy.deepcopy(models) for model in models: if isinstance(model, str):