X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f12a9837a7a7a49507106a1f0d4d335b682fe1f6..f7179cd5fbb16e2454f1a193a213f6607592e22c:/apps/newtagging/models.py

diff --git a/apps/newtagging/models.py b/apps/newtagging/models.py
index e121994c7..2055ec318 100644
--- a/apps/newtagging/models.py
+++ b/apps/newtagging/models.py
@@ -1,8 +1,12 @@
+# -*- coding: utf-8 -*-
 """
 Models and managers for generic tagging.
 """
+
 # Python 2.3 compatibility
-if not hasattr(__builtins__, 'set'):
+try:
+    set
+except NameError: 
     from sets import Set as set
 
 from django.contrib.contenttypes import generic
@@ -108,7 +112,7 @@ class TagManager(models.Manager):
         WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
             %%s
             %(extra_where)s
-        GROUP BY %(tag)s.id, %(tag)s.name
+        GROUP BY %(tag_columns)s, %(tag)s.id, %(tag)s.name
         %%s
         ORDER BY %(tag)s.%(ordering)s ASC""" % {
             'tag': qn(self.model._meta.db_table),