Fixes #3511: capitalize objects.

[wolnelektury.git] / apps / lesmianator / models.py

diff --git a/apps/lesmianator/models.py b/apps/lesmianator/models.py
index 83e8213..5db02c2 100644 (file)
--- a/apps/lesmianator/models.py
+++ b/apps/lesmianator/models.py
@@ -14,7 +14,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.conf import settings
 
 from jsonfield import JSONField
@@ -103,7 +103,7 @@ class Continuations(models.Model):
     pickle = models.FileField(_('Continuations file'), upload_to='lesmianator')
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
 
     class Meta:
         unique_together = (('content_type', 'object_id'), )
@@ -142,13 +142,7 @@ class Continuations(models.Model):
 
     @classmethod
     def for_set(cls, tag):
-        # book contains its descendants, we don't want them twice
-        books = Book.tagged.with_any((tag,))
-        l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books.iterator()])
-        descendants_keys = [book.pk for book in Book.tagged.with_any(l_tags).iterator()]
-        if descendants_keys:
-            books = books.exclude(pk__in=descendants_keys)
-
+        books = Book.tagged_top_level([tag])
         cont_tabs = (cls.get(b) for b in books.iterator())
         return reduce(cls.join_conts, cont_tabs)
 
@@ -174,7 +168,7 @@ class Continuations(models.Model):
             elif isinstance(sth, Tag):
                 conts = cls.for_set(sth)
             else:
-                raise NotImplemented('Lesmianator continuations: only Book and Tag supported')
+                raise NotImplementedError('Lesmianator continuations: only Book and Tag supported')
 
             c, created = cls.objects.get_or_create(content_type=object_type, object_id=sth.id)
             c.pickle.save(sth.slug+'.p', ContentFile(cPickle.dumps((should_keys, conts))))