Merge branch 'feature/django-1.7' into develop

Author: Fantomas42

tagging/forms.py

@@ -12,6 +12,7 @@
 class TagAdminForm(forms.ModelForm):
     class Meta:
         model = Tag
+        fields = ('name',)
 
     def clean_name(self):
         value = self.cleaned_data['name']
@@ -21,7 +22,7 @@ def clean_name(self):
         elif len(tag_names[0]) > settings.MAX_TAG_LENGTH:
             raise forms.ValidationError(
                 _('A tag may be no more than %s characters long.') %
-                    settings.MAX_TAG_LENGTH)
+                settings.MAX_TAG_LENGTH)
         return value
 
 
@@ -38,5 +39,5 @@ def clean(self, value):
             if len(tag_name) > settings.MAX_TAG_LENGTH:
                 raise forms.ValidationError(
                     _('Each tag may be no more than %s characters long.') %
-                        settings.MAX_TAG_LENGTH)
+                    settings.MAX_TAG_LENGTH)
         return value

tagging/models.py

@@ -159,12 +159,15 @@ def usage_for_queryset(self, queryset, counts=False, min_count=None):
         """
 
         if getattr(queryset.query, 'get_compiler', None):
-            # Django 1.2+
             compiler = queryset.query.get_compiler(using='default')
+            if getattr(compiler, 'compile', None):
+                # Django 1.7+
+                where, params = compiler.compile(queryset.query.where)
+            else:
+                # Django 1.2+
+                where, params = queryset.query.where.as_sql(
+                    compiler.quote_name_unless_alias, compiler.connection)
             extra_joins = ' '.join(compiler.get_from_clause()[0][1:])
-            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:])