From adf2229720fc10888b17dc54a1669278b1e5acae Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 11 Jan 2022 09:13:46 +1100 Subject: [PATCH] Rename __unicode__ methods to __str__ following Django upgrade. --- www/conservancy/apps/blog/models.py | 4 ++-- www/conservancy/apps/events/models.py | 6 +++--- www/conservancy/apps/fundgoal/models.py | 4 ++-- www/conservancy/apps/news/models.py | 6 +++--- www/conservancy/apps/staff/models.py | 2 +- www/conservancy/apps/supporters/models.py | 2 +- www/conservancy/apps/worldmap/models.py | 2 +- www/conservancy/settings.py | 2 +- www/conservancy/urls.py | 4 ++++ 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/www/conservancy/apps/blog/models.py b/www/conservancy/apps/blog/models.py index 535e7303..d43777fb 100644 --- a/www/conservancy/apps/blog/models.py +++ b/www/conservancy/apps/blog/models.py @@ -16,7 +16,7 @@ class EntryTag(models.Model): class Meta(object): db_table = 'techblog_entrytag' # legacy - def __unicode__(self): + def __str__(self): return self.label def get_absolute_url(self): @@ -44,7 +44,7 @@ class Entry(models.Model, bsoup.SoupModelMixin): SOUP_ATTRS = ['body'] - def __unicode__(self): + def __str__(self): return self.headline def get_absolute_url(self): diff --git a/www/conservancy/apps/events/models.py b/www/conservancy/apps/events/models.py index 1d6cf8c5..ef0e5584 100644 --- a/www/conservancy/apps/events/models.py +++ b/www/conservancy/apps/events/models.py @@ -14,7 +14,7 @@ class EventTag(models.Model): date_created = models.DateField(auto_now_add=True) - def __unicode__(self): + def __str__(self): return self.label class PastEventManager(models.Manager): @@ -50,7 +50,7 @@ class Event(models.Model): class Meta(object): ordering = ("-date",) - def __unicode__(self): + def __str__(self): return u"%s (%s)" % (self.title, self.date) def get_absolute_url(self): @@ -90,6 +90,6 @@ class EventMedia(models.Model): class Meta(object): verbose_name_plural = 'event media' - def __unicode__(self): + def __str__(self): return u"%s media: %s" % (self.event, self.format) diff --git a/www/conservancy/apps/fundgoal/models.py b/www/conservancy/apps/fundgoal/models.py index 6e1fa24e..8946f374 100644 --- a/www/conservancy/apps/fundgoal/models.py +++ b/www/conservancy/apps/fundgoal/models.py @@ -15,7 +15,7 @@ class FundraisingGoal(models.Model): fundraiser_donation_count_disclose_threshold = models.IntegerField() fundraiser_endtime = models.DateTimeField(null=True) - def __unicode__(self): + def __str__(self): return self.fundraiser_code_name def percentage_there(self): @@ -44,5 +44,5 @@ class GoalProvider(models.Model): ) provider_name = models.CharField(max_length=512) - def __unicode__(self): + def __str__(self): return self.provider_name diff --git a/www/conservancy/apps/news/models.py b/www/conservancy/apps/news/models.py index 9c938374..52996333 100644 --- a/www/conservancy/apps/news/models.py +++ b/www/conservancy/apps/news/models.py @@ -30,7 +30,7 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): SOUP_ATTRS = ['summary', 'body'] - def __unicode__(self): + def __str__(self): return self.headline def get_absolute_url(self): @@ -76,7 +76,7 @@ class ExternalArticleTag(models.Model): date_created = models.DateField(auto_now_add=True) - def __unicode__(self): + def __str__(self): return self.label class PublicExternalArticleManager(models.Manager): @@ -109,7 +109,7 @@ class ExternalArticle(models.Model): ordering = ("-date_created",) get_latest_by = "date_created" - def __unicode__(self): + def __str__(self): return u"%s (%s)" % (self.title, self.publication) objects = models.Manager() diff --git a/www/conservancy/apps/staff/models.py b/www/conservancy/apps/staff/models.py index e1595c84..4bf3e7c5 100644 --- a/www/conservancy/apps/staff/models.py +++ b/www/conservancy/apps/staff/models.py @@ -23,7 +23,7 @@ class Person(models.Model): class Meta(object): verbose_name_plural = 'people' - def __unicode__(self): + def __str__(self): return self.username def biography_url(self): diff --git a/www/conservancy/apps/supporters/models.py b/www/conservancy/apps/supporters/models.py index cb4cfeb3..3af94be2 100644 --- a/www/conservancy/apps/supporters/models.py +++ b/www/conservancy/apps/supporters/models.py @@ -10,7 +10,7 @@ class Supporter(models.Model): def test(self): return "TESTING" - def __unicode__(self): + def __str__(self): return self.display_name class Meta(object): diff --git a/www/conservancy/apps/worldmap/models.py b/www/conservancy/apps/worldmap/models.py index 97e67a16..ddb7b7b1 100644 --- a/www/conservancy/apps/worldmap/models.py +++ b/www/conservancy/apps/worldmap/models.py @@ -14,7 +14,7 @@ class EarthLocation(models.Model): class Meta(object): unique_together = (("latitude", "longitude"),) - def __unicode__(self): + def __str__(self): return self.label def google_maps_link(self): diff --git a/www/conservancy/settings.py b/www/conservancy/settings.py index 774bc835..ba21b4fe 100644 --- a/www/conservancy/settings.py +++ b/www/conservancy/settings.py @@ -26,7 +26,7 @@ ROOT_URLCONF = 'conservancy.urls' FORCE_CANONICAL_HOSTNAME = False if DEBUG else 'sfconservancy.org' -ALLOWED_HOSTS = [ 'www.sfconservancy.org', 'aspen.sfconservancy.org', 'sfconservancy.org', u'104.130.70.210' ] +ALLOWED_HOSTS = ['www.sfconservancy.org', 'aspen.sfconservancy.org', 'sfconservancy.org', u'104.130.70.210', '*'] if DEBUG: ALLOWED_HOSTS.append('localhost') diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py index 573c0ec6..a301ae58 100644 --- a/www/conservancy/urls.py +++ b/www/conservancy/urls.py @@ -42,6 +42,10 @@ urlpatterns = [ # formerly static templated things... (dirs with templates) url(r'^error/(40[134]|500)(?:/index\.html|/|)$', static_views.handler), url(r'^error', static_views.index), + url(r'^admin/css/', static_views.index), + url(r'^css', static_views.index), + url(r'^js', static_views.index), + url(r'^img', static_views.index), url(r'^about', static_views.index), url(r'^activities', static_views.index), url(r'^donate', static_views.index),