Merge ~lvoytek/ubuntu/+source/python-django-tagging:django4.2-compatibility into ubuntu/+source/python-django-tagging:ubuntu/devel

[Lena Voytek]

Add a patch to allow django-tagging to work with Django 4.2 by fixing the FullResultSet exception caused during normal operation

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/django-4-mantic

The package also still builds properly with Django 3 FWIW as seen in this ppa:
https://launchpad.net/~lvoytek/+archive/ubuntu/django3-mantic

This issue has yet to be addressed upstream and has no relevant merge requests for it so I created the patch myself. I also sent a merge request to debian and notified the python team but have yet to hear back:
https://salsa.debian.org/python-team/packages/python-django-tagging/-/merge_requests/2

[Michał Małoszewski (michal-maloszewski99)]

LGTM, +1

[Simon Quigley (tsimonq2)]

Given the existing +1, the packaging looks good as well. Thanks for using DEP-3 headers!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: tsimonq2, lvoytek
Uploaders: tsimonq2
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

This was uploaded and migrated into noble already, closing.

https://launchpad.net/ubuntu/+source/python-django-tagging/1:0.5.0-4ubuntu1

diff --git a/debian/changelog b/debian/changelog
index f0ead9f..49494b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-django-tagging (1:0.5.0-4ubuntu1) mantic; urgency=medium
+
+   * d/p/django-4.x-fixes/Check-FullResultSet-exception.patch: Fix
+     compatibility with Django 4 by handling FullResultSet exception introduced
+     in version 4.2 (LP: #2022089)
+
+ -- Lena Voytek <[e-mail]>  Fri, 18 Aug 2023 14:32:42 -0700
+
 python-django-tagging (1:0.5.0-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 817d5e0..2137abe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: python-django-tagging
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders:
  Jonas Genannt <[e-mail]>,
  Christopher Baines <[e-mail]>,
diff --git a/debian/patches/django-4.x-fixes/Check-FullResultSet-exception.patch b/debian/patches/django-4.x-fixes/Check-FullResultSet-exception.patch
 new file mode 100644
index 0000000..f01aabb
--- /dev/null
+++ b/debian/patches/django-4.x-fixes/Check-FullResultSet-exception.patch
@@ -0,0 +1,55 @@
+Description: Ignore FullResultSet exception introduced in Django 4.2
+ As of version 4.2 Django added an exception during query generation when a
+ query matches everything contained in a table. Since the
+ models.usage_for_queryset function is meant to handle this case, this patch
+ instead uses the exception to determine if extra criteria are required. This
+ effectively replaces the if statement that determines if a "where" value was
+ generated. The if statement is maintained along with the ImportError skip to
+ keep compatibility with older Django versions.
+Author: Lena Voytek <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django-tagging/+bug/2022089
+Last-Update: 2023-08-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tagging/models.py
++++ b/tagging/models.py
+@@ -9,6 +9,12 @@
+ from django.utils.encoding import smart_str
+ from django.utils.translation import gettext_lazy as _
+ 
++# FullResultSet exception is new to Django 4.2
++try:
++    from django.core.exceptions import FullResultSet
++except ImportError:
++    pass
++
+ from tagging import settings
+ from tagging.utils import LOGARITHMIC
+ from tagging.utils import calculate_cloud
+@@ -177,13 +183,21 @@
+         Passing a value for ``min_count`` implies ``counts=True``.
+         """
+         compiler = queryset.query.get_compiler(using=queryset.db)
+-        where, params = compiler.compile(queryset.query.where)
+-        extra_joins = ' '.join(compiler.get_from_clause()[0][1:])
++        params = []
++
++        try:
++            where, params = compiler.compile(queryset.query.where)
++
++            if where:
++                extra_criteria = 'AND %s' % where
++            else:
++                extra_criteria = ''
+ 
+-        if where:
+-            extra_criteria = 'AND %s' % where
+-        else:
++        except FullResultSet:
+             extra_criteria = ''
++
++        extra_joins = ' '.join(compiler.get_from_clause()[0][1:])
++
+         return self._get_usage(queryset.model, counts, min_count,
+                                extra_joins, extra_criteria, params)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9c3c21a..608099b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ Use-local-inventory-for-intersphinx.patch
 django-4.x-fixes/Use-smart_str-instead-of-deprecated-smart_text-Django-fun.patch
 django-4.x-fixes/Use-re_path-instead-of-deprecated-url-Django-function.patch
 django-4.x-fixes/Add-support-for-Django-4-compatibility.patch
+django-4.x-fixes/Check-FullResultSet-exception.patch
 python3.11.patch