Minor upgrades.

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

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index 0ed8958..a846f6e 100755 (executable)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#

 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -66,13 +64,13 @@ class Book(models.Model):
     def __len__(self):
         return self.chunk_set.count()
 
     def __len__(self):
         return self.chunk_set.count()
 

-    def __nonzero__(self):
+    def __bool__(self):

         """
             Necessary so that __len__ isn't used for bool evaluation.
         """
         return True
 
         """
             Necessary so that __len__ isn't used for bool evaluation.
         """
         return True
 

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

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


@@ -95,7 +93,7 @@ class Book(models.Model):
     # =======================
 
     def accessible(self, request):
     # =======================
 
     def accessible(self, request):

-        return self.public or request.user.is_authenticated()
+        return self.public or request.user.is_authenticated

 
     @classmethod
     @transaction.atomic
 
     @classmethod
     @transaction.atomic


@@ -266,12 +264,12 @@ class Book(models.Model):
 
         try:
             bi = self.wldocument(changes=changes, strict=True).book_info
 
         try:
             bi = self.wldocument(changes=changes, strict=True).book_info

-        except ParseError, e:
-            raise AssertionError(_('Invalid XML') + ': ' + unicode(e))
+        except ParseError as e:
+            raise AssertionError(_('Invalid XML') + ': ' + str(e))

         except NoDublinCore:
             raise AssertionError(_('No Dublin Core found.'))
         except NoDublinCore:
             raise AssertionError(_('No Dublin Core found.'))

-        except ValidationError, e:
-            raise AssertionError(_('Invalid Dublin Core') + ': ' + unicode(e))
+        except ValidationError as e:
+            raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e))

 
         valid_about = self.correct_about()
         assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about
 
         valid_about = self.correct_about()
         assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about


@@ -279,7 +277,7 @@ class Book(models.Model):
     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