Fixes

[redakcja.git] / src / catalogue / models / image.py

diff --git a/src/catalogue/models/image.py b/src/catalogue/models/image.py
index 646dd0a..8cadcec 100755 (executable)
--- a/src/catalogue/models/image.py
+++ b/src/catalogue/models/image.py
@@ -10,7 +10,6 @@ from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 from catalogue.helpers import cached_in_field
 from catalogue.models import Project
 from django.utils.translation import ugettext_lazy as _
 from catalogue.helpers import cached_in_field
 from catalogue.models import Project

-from catalogue.tasks import refresh_instance

 from dvcs import models as dvcs_models
 
 
 from dvcs import models as dvcs_models
 
 


@@ -25,7 +24,6 @@ class Image(dvcs_models.Document):
     project = models.ForeignKey(Project, null=True, blank=True)
 
     # cache
     project = models.ForeignKey(Project, null=True, blank=True)
 
     # cache

-    _short_html = models.TextField(null=True, blank=True, editable=False)

     _new_publishable = models.NullBooleanField(editable=False)
     _published = models.NullBooleanField(editable=False)
     _changed = models.NullBooleanField(editable=False)
     _new_publishable = models.NullBooleanField(editable=False)
     _published = models.NullBooleanField(editable=False)
     _changed = models.NullBooleanField(editable=False)


@@ -40,7 +38,7 @@ class Image(dvcs_models.Document):
     # Representing
     # ============
 
     # Representing
     # ============
 

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

         return self.title
 
     @models.permalink
         return self.title
 
     @models.permalink


@@ -83,11 +81,11 @@ class Image(dvcs_models.Document):
             picture = WLPicture.from_bytes(
                     picture_xml.encode('utf-8'),
                     image_store=SelfImageStore)
             picture = WLPicture.from_bytes(
                     picture_xml.encode('utf-8'),
                     image_store=SelfImageStore)

-        except ParseError, e:
+        except ParseError as e:

             raise AssertionError(_('Invalid XML') + ': ' + str(e))
         except NoDublinCore:
             raise AssertionError(_('No Dublin Core found.'))
             raise AssertionError(_('Invalid XML') + ': ' + str(e))
         except NoDublinCore:
             raise AssertionError(_('No Dublin Core found.'))

-        except ValidationError, e:
+        except ValidationError as e:

             raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e))
 
         valid_about = self.correct_about()
             raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e))
 
         valid_about = self.correct_about()


@@ -97,7 +95,7 @@ class Image(dvcs_models.Document):
     def publishable_error(self):
         try:
             return self.assert_publishable()
     def publishable_error(self):
         try:
             return self.assert_publishable()

-        except AssertionError, e:
+        except AssertionError as e:

             return e
         else:
             return None
             return e
         else:
             return None


@@ -122,33 +120,13 @@ class Image(dvcs_models.Document):
         return not self.head.publishable
     changed = cached_in_field('_changed')(is_changed)
 
         return not self.head.publishable
     changed = cached_in_field('_changed')(is_changed)
 

-    @cached_in_field('_short_html')
-    def short_html(self):
-        return render_to_string(
-                    'catalogue/image_short.html', {'image': self})
-
-    def refresh(self):
-        """This should be done offline."""
-        self.short_html
-        self.single
-        self.new_publishable
-        self.published
-

     def touch(self):
         update = {
             "_changed": self.is_changed(),
     def touch(self):
         update = {
             "_changed": self.is_changed(),

-            "_short_html": None,

             "_new_publishable": self.is_new_publishable(),
             "_published": self.is_published(),
         }
         Image.objects.filter(pk=self.pk).update(**update)
             "_new_publishable": self.is_new_publishable(),
             "_published": self.is_published(),
         }
         Image.objects.filter(pk=self.pk).update(**update)

-        refresh_instance(self)
-
-    def refresh(self):
-        """This should be done offline."""
-        self.changed
-        self.short_html
-

 
     # Publishing
     # ==========
 
     # Publishing
     # ==========