Django 1.7, Python 3.4

[turniej.git] / apps / poetry / models.py

diff --git a/apps/poetry/models.py b/apps/poetry/models.py
index ef8bf94..c0e6c93 100644 (file)
--- a/apps/poetry/models.py
+++ b/apps/poetry/models.py
@@ -17,7 +17,7 @@ class Poet(models.Model):
     first_line_title = models.BooleanField(default=False)
     skip_first_lines = models.IntegerField(default=0)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def get_absolute_url(self):
@@ -30,7 +30,7 @@ class Poet(models.Model):
             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         os.chdir(curdir)
         stdout, stderr = proc.communicate()
-        text = unicode(stdout, "utf-8", errors="ignore")[:1000]
+        text = str(stdout, "utf-8", errors="ignore")[:1000]
         slug = get_hash(text)
         title = ''
         if self.first_line_title:
@@ -53,6 +53,9 @@ class Poet(models.Model):
             p.save()
         return self.poem_set.filter(for_contest=True)
 
+    def contest_poems(self):
+        return self.poem_set.filter(in_contest=True)
+
 
 class Poem(models.Model):
     slug = models.SlugField(max_length=50, db_index=True)
@@ -66,10 +69,9 @@ class Poem(models.Model):
     for_contest = models.BooleanField(default=False)
     in_contest = models.BooleanField(default=False)
 
-    def __unicode__(self):
-        oneliner = u"%s, %s" % (self.poet.name, self.pretty_title())
-        if not self.title:
-            oneliner += u" [%s…]" % self.text[:20]
+    def __str__(self):
+        oneliner = "%s, %s" % (self.poet.name, self.pretty_title())
+        oneliner += " [%s…]" % (" ".join(self.text.split()[:5]))
         return oneliner
 
     def get_absolute_url(self):