diff --git a/www/conservancy/apps/news/models.py b/www/conservancy/apps/news/models.py index c516a86e6c941aaaa60f2bc5f907596648866b29..64d31d63eacf002e59252d48811b1dd6d9ba6145 100644 --- a/www/conservancy/apps/news/models.py +++ b/www/conservancy/apps/news/models.py @@ -1,4 +1,3 @@ -from builtins import object from django.db import models from django.conf import settings from conservancy import bsoup @@ -22,7 +21,7 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): date_last_modified = models.DateTimeField(auto_now=True) - class Meta(object): + class Meta: ordering = ("-pub_date",) get_latest_by = "pub_date" @@ -32,7 +31,7 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): return self.headline def get_absolute_url(self): - return u"/news/%s/%s/" % (self.pub_date.strftime("%Y/%b/%d").lower(), + return "/news/{}/{}/".format(self.pub_date.strftime("%Y/%b/%d").lower(), self.slug) def is_recent(self): @@ -46,7 +45,7 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): def save(self): if settings.CONSERVANCY_DEVEL or True: - super(PressRelease, self).save() + super().save() return blog_name = 'Software Freedom Conservancy News' @@ -65,7 +64,7 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): reply = j.weblogUpdates.ping(blog_name, blog_url, post_url) # Call any superclass's method - super(PressRelease, self).save() + super().save() class ExternalArticleTag(models.Model): """A way to tag external articles""" @@ -79,7 +78,7 @@ class ExternalArticleTag(models.Model): class PublicExternalArticleManager(models.Manager): def get_queryset(self): - return super(PublicExternalArticleManager, self).get_queryset().filter(visible=True) + return super().get_queryset().filter(visible=True) class ExternalArticle(models.Model): """A system for displaying Conservancy news mentions on the site. @@ -103,12 +102,12 @@ class ExternalArticle(models.Model): date_created = models.DateField(auto_now_add=True) - class Meta(object): + class Meta: ordering = ("-date_created",) get_latest_by = "date_created" def __str__(self): - return u"%s (%s)" % (self.title, self.publication) + return "{} ({})".format(self.title, self.publication) objects = models.Manager() public = PublicExternalArticleManager()