Publishing tags, and fixes.

[wolnelektury.git] / src / catalogue / models / source.py

diff --git a/src/catalogue/models/source.py b/src/catalogue/models/source.py
index bcf5254..ee024e0 100644 (file)
--- a/src/catalogue/models/source.py
+++ b/src/catalogue/models/source.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 
 
 class Source(models.Model):
 
 
 class Source(models.Model):


@@ -17,7 +16,7 @@ class Source(models.Model):
         verbose_name_plural = _('sources')
         app_label = 'catalogue'
 
         verbose_name_plural = _('sources')
         app_label = 'catalogue'
 

-    def __unicode__(self):
+    def __str__(self):

         return self.netloc
 
     def save(self, *args, **kwargs):
         return self.netloc
 
     def save(self, *args, **kwargs):


@@ -26,7 +25,7 @@ class Source(models.Model):
             str(self.pk)
             old_self = type(self).objects.get(pk=self)
         except type(self).DoesNotExist:
             str(self.pk)
             old_self = type(self).objects.get(pk=self)
         except type(self).DoesNotExist:

-            old_name = u''
+            old_name = ''

             old_netloc = self.netloc
         else:
             old_name = old_self.name
             old_netloc = self.netloc
         else:
             old_name = old_self.name


@@ -38,7 +37,7 @@ class Source(models.Model):
         # and invalidate their cached includes.
         if old_name != self.name or old_netloc != self.netloc:
             for book in Book.objects.all():
         # and invalidate their cached includes.
         if old_name != self.name or old_netloc != self.netloc:
             for book in Book.objects.all():

-                source = book.extra_info.get('source_url', '')
+                source = book.get_extra_info_json().get('source_url', '')

                 if self.netloc in source or (old_netloc != self.netloc and old_netloc in source):
                 if self.netloc in source or (old_netloc != self.netloc and old_netloc in source):

-                    book.flush_includes()
+                    book.clear_cache()

         return ret
         return ret