From 49eff7af795db14bc38f43843ce9774ba324160f Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Fri, 26 Nov 2021 13:49:40 +1100 Subject: [PATCH] Apply "object" changes only from `futurize --stage2`. --- www/conservancy/__init__.py | 1 + www/conservancy/apps/blog/models.py | 4 ++-- www/conservancy/apps/contacts/models.py | 3 ++- www/conservancy/apps/contacts/views.py | 3 ++- www/conservancy/apps/events/models.py | 5 +++-- www/conservancy/apps/fundgoal/models.py | 3 ++- www/conservancy/apps/news/models.py | 3 ++- www/conservancy/apps/staff/models.py | 3 ++- www/conservancy/apps/summit_registration/models.py | 3 ++- www/conservancy/apps/summit_registration/views.py | 3 ++- www/conservancy/apps/supporters/models.py | 3 ++- www/conservancy/apps/worldmap/models.py | 3 ++- www/conservancy/bsoup.py | 3 ++- www/conservancy/middleware.py | 1 + 14 files changed, 27 insertions(+), 14 deletions(-) diff --git a/www/conservancy/__init__.py b/www/conservancy/__init__.py index e900952d..9c112546 100644 --- a/www/conservancy/__init__.py +++ b/www/conservancy/__init__.py @@ -1,3 +1,4 @@ +from builtins import object import hashlib from django.conf import settings diff --git a/www/conservancy/apps/blog/models.py b/www/conservancy/apps/blog/models.py index 942e97a3..88b5cbf3 100644 --- a/www/conservancy/apps/blog/models.py +++ b/www/conservancy/apps/blog/models.py @@ -10,7 +10,7 @@ class EntryTag(models.Model): label = models.CharField(max_length=100) slug = models.SlugField() - class Meta: + class Meta(object): db_table = 'techblog_entrytag' # legacy def __unicode__(self): @@ -33,7 +33,7 @@ class Entry(models.Model, bsoup.SoupModelMixin): date_created = models.DateTimeField(auto_now_add=True) date_last_modified = models.DateTimeField(auto_now=True) - class Meta: + class Meta(object): db_table = 'techblog_entries' # legacy verbose_name_plural = 'entries' ordering = ('-pub_date',) diff --git a/www/conservancy/apps/contacts/models.py b/www/conservancy/apps/contacts/models.py index 4cd4d1ef..02cb83d2 100644 --- a/www/conservancy/apps/contacts/models.py +++ b/www/conservancy/apps/contacts/models.py @@ -1,3 +1,4 @@ +from builtins import object from django.db import models class ContactEntry(models.Model): @@ -8,6 +9,6 @@ class ContactEntry(models.Model): email = models.EmailField() # should make it unique, but we really cannot subscribe_conservancy = models.BooleanField(default=False) - class Meta: + class Meta(object): ordering = ('email',) diff --git a/www/conservancy/apps/contacts/views.py b/www/conservancy/apps/contacts/views.py index 88337793..220d05bb 100644 --- a/www/conservancy/apps/contacts/views.py +++ b/www/conservancy/apps/contacts/views.py @@ -1,3 +1,4 @@ +from builtins import object from django.shortcuts import render from django import forms from conservancy.apps.contacts.models import ContactEntry @@ -8,7 +9,7 @@ def subscribe(request): """ class ContactEntryForm(ModelForm): - class Meta: + class Meta(object): model = ContactEntry ContactEntryForm.base_fields['subscribe_conservancy'].label = 'Receive Software Freedom Conservancy updates' diff --git a/www/conservancy/apps/events/models.py b/www/conservancy/apps/events/models.py index 481f8713..19e27198 100644 --- a/www/conservancy/apps/events/models.py +++ b/www/conservancy/apps/events/models.py @@ -1,3 +1,4 @@ +from builtins import object from django.db import models from conservancy.apps.staff.models import Person from conservancy.apps.worldmap.models import EarthLocation @@ -46,7 +47,7 @@ class Event(models.Model): date_created = models.DateTimeField(auto_now_add=True) date_last_modified = models.DateTimeField(auto_now=True) - class Meta: + class Meta(object): ordering = ("-date",) def __unicode__(self): @@ -86,7 +87,7 @@ class EventMedia(models.Model): date_created = models.DateTimeField(auto_now_add=True) date_last_modified = models.DateTimeField(auto_now=True) - class Meta: + class Meta(object): verbose_name_plural = 'event media' def __unicode__(self): diff --git a/www/conservancy/apps/fundgoal/models.py b/www/conservancy/apps/fundgoal/models.py index 870d61c4..ac1d8252 100644 --- a/www/conservancy/apps/fundgoal/models.py +++ b/www/conservancy/apps/fundgoal/models.py @@ -1,3 +1,4 @@ +from builtins import object import random from django.db import models @@ -18,7 +19,7 @@ class FundraisingGoal(models.Model): def percentage_there(self): return (self.fundraiser_so_far_amount / self.fundraiser_goal_amount ) * 100 - class Meta: + class Meta(object): ordering = ('fundraiser_code_name',) def providers(self): diff --git a/www/conservancy/apps/news/models.py b/www/conservancy/apps/news/models.py index ef916360..b4e7257a 100644 --- a/www/conservancy/apps/news/models.py +++ b/www/conservancy/apps/news/models.py @@ -1,3 +1,4 @@ +from builtins import object from django.db import models from django.conf import settings from conservancy import bsoup @@ -21,7 +22,7 @@ class PressRelease(models.Model, bsoup.SoupModelMixin): date_last_modified = models.DateTimeField(auto_now=True) - class Meta: + class Meta(object): ordering = ("-pub_date",) get_latest_by = "pub_date" diff --git a/www/conservancy/apps/staff/models.py b/www/conservancy/apps/staff/models.py index 10116de9..70876680 100644 --- a/www/conservancy/apps/staff/models.py +++ b/www/conservancy/apps/staff/models.py @@ -1,3 +1,4 @@ +from builtins import object from django.db import models class Person(models.Model): @@ -19,7 +20,7 @@ class Person(models.Model): date_created = models.DateTimeField(auto_now_add=True) date_last_modified = models.DateTimeField(auto_now=True) - class Meta: + class Meta(object): verbose_name_plural = 'people' def __unicode__(self): diff --git a/www/conservancy/apps/summit_registration/models.py b/www/conservancy/apps/summit_registration/models.py index 1bb0dc95..b20c683d 100644 --- a/www/conservancy/apps/summit_registration/models.py +++ b/www/conservancy/apps/summit_registration/models.py @@ -1,3 +1,4 @@ +from builtins import object from django.db import models class SummitRegistration(models.Model): @@ -11,6 +12,6 @@ class SummitRegistration(models.Model): date_created = models.DateField(auto_now_add=True) cle_credit = models.BooleanField(default=True) - class Meta: + class Meta(object): ordering = ('name',) diff --git a/www/conservancy/apps/summit_registration/views.py b/www/conservancy/apps/summit_registration/views.py index 2dcf1395..399ccc9d 100644 --- a/www/conservancy/apps/summit_registration/views.py +++ b/www/conservancy/apps/summit_registration/views.py @@ -1,3 +1,4 @@ +from builtins import object from django.shortcuts import render from django import forms from conervancy.apps.summit_registration.models import SummitRegistration @@ -7,7 +8,7 @@ def register(request): """ class SummitForm(ModelForm): - class Meta: + class Meta(object): model = SummitRegistration SummitForm.base_fields['email'].label = 'Email address' diff --git a/www/conservancy/apps/supporters/models.py b/www/conservancy/apps/supporters/models.py index 090c90be..cb4cfeb3 100644 --- a/www/conservancy/apps/supporters/models.py +++ b/www/conservancy/apps/supporters/models.py @@ -1,3 +1,4 @@ +from builtins import object from django.db import models class Supporter(models.Model): @@ -12,5 +13,5 @@ class Supporter(models.Model): def __unicode__(self): return self.display_name - class Meta: + class Meta(object): ordering = ('ledger_entity_id',) diff --git a/www/conservancy/apps/worldmap/models.py b/www/conservancy/apps/worldmap/models.py index 16643a6f..97e67a16 100644 --- a/www/conservancy/apps/worldmap/models.py +++ b/www/conservancy/apps/worldmap/models.py @@ -1,3 +1,4 @@ +from builtins import object from django.db import models class EarthLocation(models.Model): @@ -10,7 +11,7 @@ class EarthLocation(models.Model): date_created = models.DateTimeField(auto_now_add=True) date_last_modified = models.DateTimeField(auto_now=True) - class Meta: + class Meta(object): unique_together = (("latitude", "longitude"),) def __unicode__(self): diff --git a/www/conservancy/bsoup.py b/www/conservancy/bsoup.py index 28ccdd08..de0107c0 100644 --- a/www/conservancy/bsoup.py +++ b/www/conservancy/bsoup.py @@ -1,5 +1,6 @@ # -*- encoding: utf-8 -*- +from builtins import object import io import itertools import re @@ -105,7 +106,7 @@ class BeautifulSoup(bs4.BeautifulSoup): return self.find_all(self.is_video_source, src=True) -class SoupModelMixin: +class SoupModelMixin(object): """Mixin for models to parse HTML with BeautifulSoup. Classes that use this mixin must define `SOUP_ATTRS`, a list of strings diff --git a/www/conservancy/middleware.py b/www/conservancy/middleware.py index cfb6eb38..7abbac7b 100644 --- a/www/conservancy/middleware.py +++ b/www/conservancy/middleware.py @@ -1,3 +1,4 @@ +from builtins import object from future.utils import raise_ from django import http from django.conf import settings