diff --git a/www/conservancy/__init__.py b/www/conservancy/__init__.py index e900952d54630a036e53a900a39b9f1d45e344a8..9c1125466f99ea09717f3b8fdf48f3441f678b71 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 942e97a3a71f21e4e0777164587c03bf955ee1c6..88b5cbf36c7a4ec5aacc80e2e023d2c50ea4b52a 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 4cd4d1efeb58714a8c29ad47518152f805469b1a..02cb83d27ae9bfdfeb542f31488c62dbc3182e92 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 883377935596e94d7bfd933310f3ae47119e993d..220d05bb8d72c73a7271a721301ec652c869a420 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 481f87137a97978af3d13aca5bb32990ccbd7f57..19e271980a4b88972840e7b5a43e3ed4b4114752 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 870d61c4887a59a5f6c07439b319bdf334f8ec48..ac1d8252b53816e64b63293f249ad2d8d56d162d 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 ef916360c52441d1b4557b3a3ff739b3d2015cef..b4e7257afe271d9d4f7d7444519939235b878475 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 10116de9c497d549e1525bc718cb47038b353717..70876680a254d6a3942184f260e2a88d0127e04f 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 1bb0dc95a7ae348d116b0674797657b7d2cc3a74..b20c683dfece3a6adf94dc4593aa0aa2dbeb683e 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 2dcf13951985a3dad79af8d0fb625b9c6d325b08..399ccc9d9c4756bd975548f450d6223223785235 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 090c90be2802aa688edd20dcabaabd207a9831d2..cb4cfeb3031a6841374e61836376c6534ba4cbfc 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 16643a6f43157ccd9412ea4c08bf997edadd07d9..97e67a16ab44c7ca8efa86db5baceb82db00c966 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 28ccdd08826e017d0e1c0303efd5a4ea2c9d66f0..de0107c0eebc853fc0d7154cbd6a0e7fc4de89e4 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 cfb6eb38ff763b74fa07c3cac49c829eb7f26c3f..7abbac7b632766237c9ed2c6166248a8fca9c853 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