From ee42fd962c5abc7ed18f729ded42ee1f56397678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?= Date: Sun, 12 Dec 2021 18:13:23 +0100 Subject: [PATCH 2/4] Use smart_str instead of deprecated smart_text Django function --- tagging/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tagging/models.py b/tagging/models.py index 02550eec..d16a61ec 100644 --- a/tagging/models.py +++ b/tagging/models.py @@ -5,7 +5,7 @@ from django.contrib.contenttypes.models import ContentType from django.db import connection from django.db import models -from django.utils.encoding import smart_text +from django.utils.encoding import smart_str from django.utils.translation import gettext_lazy as _ from tagging import settings @@ -519,4 +519,4 @@ class Meta: verbose_name_plural = _('tagged items') def __str__(self): - return '%s [%s]' % (smart_text(self.object), smart_text(self.tag)) + return '%s [%s]' % (smart_str(self.object), smart_str(self.tag)) From 9c47683ec67ad2fbf82f1dce6384b156f64f55bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?= Date: Sun, 12 Dec 2021 18:14:35 +0100 Subject: [PATCH 3/4] Use re_path instead of deprecated url Django function --- tagging/tests/urls.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tagging/tests/urls.py b/tagging/tests/urls.py index aa127d5f..7db3e7e1 100644 --- a/tagging/tests/urls.py +++ b/tagging/tests/urls.py @@ -1,5 +1,5 @@ """Test urls for tagging.""" -from django.conf.urls import url +from django.urls import re_path from tagging.tests.models import Article from tagging.views import TaggedObjectList @@ -11,10 +11,10 @@ class StaticTaggedObjectList(TaggedObjectList): urlpatterns = [ - url(r'^static/$', StaticTaggedObjectList.as_view()), - url(r'^static/related/$', StaticTaggedObjectList.as_view( + re_path(r'^static/$', StaticTaggedObjectList.as_view()), + re_path(r'^static/related/$', StaticTaggedObjectList.as_view( related_tags=True)), - url(r'^no-tag/$', TaggedObjectList.as_view(model=Article)), - url(r'^no-query-no-model/$', TaggedObjectList.as_view()), - url(r'^(?P[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)), + re_path(r'^no-tag/$', TaggedObjectList.as_view(model=Article)), + re_path(r'^no-query-no-model/$', TaggedObjectList.as_view()), + re_path(r'^(?P[^/]+(?u))/$', TaggedObjectList.as_view(model=Article)), ] From 6550f6c04c0d2d67049e8cc3263623811207c66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartolom=C3=A9=20S=C3=A1nchez=20Salado?= Date: Sun, 12 Dec 2021 18:26:03 +0100 Subject: [PATCH 4/4] Add support for Django 4 compatibility --- tagging/models.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- a/tagging/models.py +++ b/tagging/models.py @@ -5,6 +5,7 @@ from django.contrib.contenttypes.models import ContentType from django.db import connection from django.db import models +from django.db.models.query_utils import Q from django.utils.encoding import smart_str from django.utils.translation import gettext_lazy as _ @@ -155,8 +156,9 @@ def usage_for_model(self, model, counts=False, min_count=None, filters = {} queryset = model._default_manager.filter() - for f in filters.items(): - queryset.query.add_filter(f) + for k, v in filters.items(): + # Add support for both Django 4 and inferior versions + queryset.query.add_q(Q((k, v))) usage = self.usage_for_queryset(queryset, counts, min_count) return usage