X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c0a7799619e217e2eac724b1a688ad37f0182253..56c5bac0c6b5fc622a0b274861a98b9dca00259e:/src/lesmianator/models.py?ds=inline diff --git a/src/lesmianator/models.py b/src/lesmianator/models.py index f12f1d778..9e2f1669e 100644 --- a/src/lesmianator/models.py +++ b/src/lesmianator/models.py @@ -17,7 +17,6 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.conf import settings from django.urls import reverse -from jsonfield import JSONField from catalogue.models import Book, Tag @@ -25,7 +24,7 @@ class Poem(models.Model): slug = models.SlugField(_('slug'), max_length=120, db_index=True) text = models.TextField(_('text')) created_by = models.ForeignKey(User, models.SET_NULL, null=True) - created_from = JSONField(_('extra information'), null=True, blank=True) + created_from = models.TextField(_('extra information'), null=True, blank=True) created_at = models.DateTimeField(_('creation date'), auto_now_add=True, editable=False) seen_at = models.DateTimeField(_('last view date'), auto_now_add=True, editable=False) view_count = models.IntegerField(_('view count'), default=1) @@ -48,7 +47,7 @@ class Poem(models.Model): @staticmethod def choose_letter(word, continuations): if word not in continuations: - return u'\n' + return '\n' choices = sum((continuations[word][letter] for letter in continuations[word])) @@ -67,7 +66,7 @@ class Poem(models.Model): return '' letters = [] - word = u'' + word = '' finished_stanza_verses = 0 current_stanza_verses = 0 @@ -83,7 +82,7 @@ class Poem(models.Model): word = word[-length + 1:] + letter char_count += 1 - if letter == u'\n': + if letter == '\n': if verse_start: finished_stanza_verses += current_stanza_verses current_stanza_verses = 0