From 24cd0a91184be6fa20168f9b132b1ab3f5911949 Mon Sep 17 00:00:00 2001 From: Jonas Genannt Date: Sun, 15 Nov 2015 22:25:54 +0100 Subject: reset patches that are included by the git migration --- tagging/models.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'tagging/models.py') diff --git a/tagging/models.py b/tagging/models.py index e13b077..860cf81 100644 --- a/tagging/models.py +++ b/tagging/models.py @@ -17,8 +17,6 @@ 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 ############ @@ -168,16 +166,9 @@ class TagManager(models.Manager): # Django 1.2+ compiler = queryset.query.get_compiler(using='default') extra_joins = ' '.join(compiler.get_from_clause()[0][1:]) - 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 - ) + 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:]) -- cgit v1.2.3