diff options
Diffstat (limited to 'debian/patches/django-1.7-compat.patch')
| -rw-r--r-- | debian/patches/django-1.7-compat.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/django-1.7-compat.patch b/debian/patches/django-1.7-compat.patch new file mode 100644 index 0000000..4e50ffe --- /dev/null +++ b/debian/patches/django-1.7-compat.patch @@ -0,0 +1,37 @@ +Description: Add django 1.7 compatibility +Author: Raphaël Hertzog <hertzog@debian.org> +Bug-Debian: http://bugs.debian.org/755624 +Origin: vendor +Last-Update: 2014-08-06 + +--- python-django-tagging-0.3.1.orig/tagging/models.py ++++ python-django-tagging-0.3.1/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:]) |