diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/django-1.7-compat.patch | 47 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 48 deletions
diff --git a/debian/patches/django-1.7-compat.patch b/debian/patches/django-1.7-compat.patch deleted file mode 100644 index 3b388e3..0000000 --- a/debian/patches/django-1.7-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 210bfd7f97afe0162e682cbd2530115cf09fd51d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org> -Date: Thu, 8 Oct 2015 11:51:55 -0700 -Subject: Add django 1.7 compatibility - -Bug-Debian: http://bugs.debian.org/755624 -Origin: vendor -Last-Update: 2014-08-06 - -Patch-Name: django-1.7-compat.patch ---- - tagging/models.py | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/tagging/models.py b/tagging/models.py -index 860cf81..e13b077 100644 ---- a/tagging/models.py -+++ b/tagging/models.py -@@ -17,6 +17,8 @@ from tagging import settings - from tagging.utils import calculate_cloud, get_tag_list, get_queryset_and_model, parse_tag_input - from tagging.utils import LOGARITHMIC - -+import collections -+ - qn = connection.ops.quote_name - - ############ -@@ -166,9 +168,16 @@ class TagManager(models.Manager): - # Django 1.2+ - compiler = queryset.query.get_compiler(using='default') - extra_joins = ' '.join(compiler.get_from_clause()[0][1:]) -- where, params = queryset.query.where.as_sql( -- compiler.quote_name_unless_alias, compiler.connection -- ) -+ if isinstance(compiler, collections.Callable): -+ # Django 1.7+ -+ where, params = queryset.query.where.as_sql( -+ compiler, compiler.connection -+ ) -+ else: -+ # Django 1.2-1.6 -+ where, params = queryset.query.where.as_sql( -+ compiler.quote_name_unless_alias, compiler.connection -+ ) - else: - # Django pre-1.2 - extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:]) diff --git a/debian/patches/series b/debian/patches/series index 5499ba6..4298cd0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ fix_calc_tag_weight fix-testsuite.patch -django-1.7-compat.patch |