diff --git a/src/auditlog/context.py b/src/auditlog/context.py index 291fc25..d8c279d 100644 --- a/src/auditlog/context.py +++ b/src/auditlog/context.py @@ -1,10 +1,10 @@ import contextlib +from functools import partial import time import threading from django.contrib.auth import get_user_model from django.db.models.signals import pre_save -from django.utils.functional import curry from auditlog.models import LogEntry @@ -21,7 +21,7 @@ def set_actor(actor, remote_addr=None): } # Connect signal for automatic logging - set_actor = curry(_set_actor, user=actor, signal_duid=threadlocal.auditlog['signal_duid']) + set_actor = partial(_set_actor, user=actor, signal_duid=threadlocal.auditlog['signal_duid']) pre_save.connect(set_actor, sender=LogEntry, dispatch_uid=threadlocal.auditlog['signal_duid'], weak=False) try: diff --git a/src/auditlog/diff.py b/src/auditlog/diff.py index e5c6221..2a5bf50 100644 --- a/src/auditlog/diff.py +++ b/src/auditlog/diff.py @@ -2,7 +2,7 @@ from django.conf import settings from django.core.exceptions import ObjectDoesNotExist from django.db.models import Model, NOT_PROVIDED, DateTimeField from django.utils import timezone -from django.utils.encoding import smart_text +from django.utils.encoding import smart_str def track_field(field): @@ -73,7 +73,7 @@ def get_field_value(obj, field): value = field.default if field.default is not NOT_PROVIDED else None else: try: - value = smart_text(getattr(obj, field.name, None)) + value = smart_str(getattr(obj, field.name, None)) except ObjectDoesNotExist: value = field.default if field.default is not NOT_PROVIDED else None @@ -133,7 +133,7 @@ def model_instance_diff(old, new): new_value = get_field_value(new, field) if old_value != new_value: - diff[field.name] = (smart_text(old_value), smart_text(new_value)) + diff[field.name] = (smart_str(old_value), smart_str(new_value)) if len(diff) == 0: diff = None diff --git a/src/auditlog/models.py b/src/auditlog/models.py index 405fa66..367a0b6 100644 --- a/src/auditlog/models.py +++ b/src/auditlog/models.py @@ -8,8 +8,8 @@ from django.core.exceptions import FieldDoesNotExist from django.db import models, DEFAULT_DB_ALIAS from django.db.models import QuerySet, Q from django.utils import formats, timezone -from django.utils.encoding import python_2_unicode_compatible, smart_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.encoding import smart_str +from django.utils.translation import gettext_lazy as _ from jsonfield.fields import JSONField from dateutil import parser @@ -38,7 +38,7 @@ class LogEntryManager(models.Manager): if changes is not None: kwargs.setdefault('content_type', ContentType.objects.get_for_model(instance)) kwargs.setdefault('object_pk', pk) - kwargs.setdefault('object_repr', smart_text(instance)) + kwargs.setdefault('object_repr', smart_str(instance)) if isinstance(pk, int): kwargs.setdefault('object_id', pk) @@ -78,7 +78,7 @@ class LogEntryManager(models.Manager): if isinstance(pk, int): return self.filter(content_type=content_type, object_id=pk) else: - return self.filter(content_type=content_type, object_pk=smart_text(pk)) + return self.filter(content_type=content_type, object_pk=smart_str(pk)) def get_for_objects(self, queryset): """ @@ -98,7 +98,7 @@ class LogEntryManager(models.Manager): if isinstance(primary_keys[0], int): return self.filter(content_type=content_type).filter(Q(object_id__in=primary_keys)).distinct() elif isinstance(queryset.model._meta.pk, models.UUIDField): - primary_keys = [smart_text(pk) for pk in primary_keys] + primary_keys = [smart_str(pk) for pk in primary_keys] return self.filter(content_type=content_type).filter(Q(object_pk__in=primary_keys)).distinct() else: return self.filter(content_type=content_type).filter(Q(object_pk__in=primary_keys)).distinct() @@ -137,7 +137,6 @@ class LogEntryManager(models.Manager): return pk -@python_2_unicode_compatible class LogEntry(models.Model): """ Represents an entry in the audit log. The content type is saved along with the textual and numeric (if available) @@ -211,7 +210,7 @@ class LogEntry(models.Model): return {} @property - def changes_str(self, colon=': ', arrow=smart_text(' \u2192 '), separator='; '): + def changes_str(self, colon=': ', arrow=smart_str(' \u2192 '), separator='; '): """ Return the changes recorded in this log entry as a string. The formatting of the string can be customized by setting alternate values for colon, arrow and separator. If the formatting is still not satisfying, please use @@ -225,7 +224,7 @@ class LogEntry(models.Model): substrings = [] for field, values in self.changes_dict.items(): - substring = smart_text('{field_name:s}{colon:s}{old:s}{arrow:s}{new:s}').format( + substring = smart_str('{field_name:s}{colon:s}{old:s}{arrow:s}{new:s}').format( field_name=field, colon=colon, old=values[0], @@ -257,7 +256,7 @@ class LogEntry(models.Model): values_display = [] # handle choices fields and Postgres ArrayField to get human readable version choices_dict = None - if hasattr(field, 'choices') and len(field.choices) > 0: + if getattr(field, 'choices', []): choices_dict = dict(field.choices) if hasattr(field, 'base_field') and getattr(field.base_field, 'choices', False): choices_dict = dict(field.base_field.choices) diff --git a/tox.ini b/tox.ini index f7be58d..5b7e310 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = {py35,py36,py37,py38}-django-20 {py35,py36,py37,py38}-django-21 {py35,py36,py37,py38}-django-22 + {py36,py37,py38}-django-30 [testenv] setenv = @@ -14,6 +15,7 @@ deps = django-20: Django>=2.0,<2.1 django-21: Django>=2.1,<2.2 django-22: Django>=2.2,<2.3 + django-30: Django>=3.0,<3.1 -r{toxinidir}/requirements-test.txt basepython = py38: python3.8