diff --git a/www/conservancy/apps/events/models.py b/www/conservancy/apps/events/models.py index ef0e558406db9dd5f863f4649724e05436b08284..d34e241c99acac7b9ffdfba527e0f58cd2f6e02f 100644 --- a/www/conservancy/apps/events/models.py +++ b/www/conservancy/apps/events/models.py @@ -1,4 +1,3 @@ -from builtins import object from django.db import models from conservancy.apps.staff.models import Person from conservancy.apps.worldmap.models import EarthLocation @@ -21,13 +20,13 @@ class PastEventManager(models.Manager): """Returns all past events""" def get_queryset(self): - return super(PastEventManager, self).get_queryset().filter(date__lt=datetime.today()) + return super().get_queryset().filter(date__lt=datetime.today()) class FutureEventManager(models.Manager): """Returns all future events""" def get_queryset(self): - return super(FutureEventManager, self).get_queryset().filter(date__gte=datetime.today()) + return super().get_queryset().filter(date__gte=datetime.today()) class Event(models.Model): """Model for Conservancy staff member events (presentations, etc)""" @@ -47,14 +46,14 @@ class Event(models.Model): date_created = models.DateTimeField(auto_now_add=True) date_last_modified = models.DateTimeField(auto_now=True) - class Meta(object): + class Meta: ordering = ("-date",) def __str__(self): - return u"%s (%s)" % (self.title, self.date) + return "{} ({})".format(self.title, self.date) def get_absolute_url(self): - return u"/events/%s/%s/" % (self.date.strftime("%Y"), self.slug) + return "/events/{}/{}/".format(self.date.strftime("%Y"), self.slug) def day_after(self): return self.date + timedelta(days=1) @@ -87,9 +86,9 @@ class EventMedia(models.Model): date_created = models.DateTimeField(auto_now_add=True) date_last_modified = models.DateTimeField(auto_now=True) - class Meta(object): + class Meta: verbose_name_plural = 'event media' def __str__(self): - return u"%s media: %s" % (self.event, self.format) + return "{} media: {}".format(self.event, self.format)