from django.core.files.base import ContentFile
from django.db import models
from django.utils.timezone import utc
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
+from django.utils.translation import gettext_lazy as _
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
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
class Poem(models.Model):
slug = models.SlugField(_('slug'), max_length=120, db_index=True)
text = models.TextField(_('text'))
- created_by = models.ForeignKey(User, null=True)
- created_from = JSONField(_('extra information'), null=True, blank=True)
+ created_by = models.ForeignKey(User, models.SET_NULL, null=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)
@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]))
return ''
letters = []
- word = u''
+ word = ''
finished_stanza_verses = 0
current_stanza_verses = 0
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
class Continuations(models.Model):
pickle = models.FileField(_('Continuations file'), upload_to='lesmianator')
- content_type = models.ForeignKey(ContentType)
+ content_type = models.ForeignKey(ContentType, models.CASCADE)
object_id = models.PositiveIntegerField()
content_object = GenericForeignKey('content_type', 'object_id')