diff --git a/www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py b/www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py index e5143c0add72fb9771aa7292d132dc719702a7c7..b7cf2a666d11fd72fd0bf8c4892a59b796e42015 100644 --- a/www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py +++ b/www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py @@ -1,6 +1,7 @@ # Generated by Django 1.11.29 on 2021-12-06 22:37 import datetime + from django.db import migrations, models import django_countries.fields diff --git a/www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py b/www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py index 9e7113b777db5bf1502adf72c0f1ac0aae8b65ea..c7ac90840331fc23d26e71de291c77163f842ee9 100644 --- a/www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py +++ b/www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py @@ -1,8 +1,9 @@ # Generated by Django 1.11.29 on 2021-12-06 22:49 -from django.db import migrations, models import uuid +from django.db import migrations, models + class Migration(migrations.Migration): diff --git a/www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py b/www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py index 625d9dbc7de83d32d97011ba6e2bdcebd8623803..79c5a77a2d4e5ac5bbb90f1b25fa135e1de36bec 100644 --- a/www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py +++ b/www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py @@ -1,8 +1,10 @@ # Generated by Django 1.11.29 on 2023-01-27 06:02 from django.db import migrations, models + from ..models import validate_mutiple_urls + class Migration(migrations.Migration): dependencies = [ diff --git a/www/conservancy/apps/assignment/urls.py b/www/conservancy/apps/assignment/urls.py index 0502b0ef4de5807ec9315c94d30877f1c17fbdab..980fe18cd17f53db2d8239afb310bdeb6a8b1d8b 100644 --- a/www/conservancy/apps/assignment/urls.py +++ b/www/conservancy/apps/assignment/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import url from .views import AssignmentCreateView, AssignmentThanksView - urlpatterns = [ url(r'^$', AssignmentCreateView.as_view(), name='assignement-add'), url(r'^(?P[\w-]+)/$', AssignmentThanksView.as_view(), name='assignment-thanks'), diff --git a/www/conservancy/apps/assignment/views.py b/www/conservancy/apps/assignment/views.py index d6184395cd092bac3a6f352827fad3c3d08f0dca..4b10b0cecbcf7c4591736d1c6424e76c1d582963 100644 --- a/www/conservancy/apps/assignment/views.py +++ b/www/conservancy/apps/assignment/views.py @@ -6,6 +6,7 @@ from django.views.generic.edit import CreateView from .forms import AssignmentForm from .models import Assignment + class AssignmentCreateView(CreateView): """Show a form for the initial copyright assignment.""" diff --git a/www/conservancy/apps/blog/admin.py b/www/conservancy/apps/blog/admin.py index 539ed50238ff427b408f13b70383dbdac7628823..827cd0d78cdadb7519248702c22d8ff3489baaa7 100644 --- a/www/conservancy/apps/blog/admin.py +++ b/www/conservancy/apps/blog/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import EntryTag, Entry +from .models import Entry, EntryTag class EntryTagAdmin(admin.ModelAdmin): diff --git a/www/conservancy/apps/blog/models.py b/www/conservancy/apps/blog/models.py index f37e4e26084140421166e89e301dc848ac5c3b93..73bf80285fa08f813a863de493469101cad54fc3 100644 --- a/www/conservancy/apps/blog/models.py +++ b/www/conservancy/apps/blog/models.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta -from django.db import models from django.conf import settings +from django.db import models from ... import bsoup from ..staff.models import Person diff --git a/www/conservancy/apps/blog/urls.py b/www/conservancy/apps/blog/urls.py index 1c46610cc16f020ce4cdb43724c022455aac7886..146f98439c7be7d5e7d97ef123cbbbd99ccd9185 100644 --- a/www/conservancy/apps/blog/urls.py +++ b/www/conservancy/apps/blog/urls.py @@ -1,10 +1,18 @@ from datetime import datetime -from django.conf.urls import url, include +from django.conf.urls import include, url -from .models import Entry, EntryTag from ..staff.models import Person -from .views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView, custom_index, query +from .models import Entry, EntryTag +from .views import ( + BlogDateDetailView, + BlogDayArchiveView, + BlogMonthArchiveView, + BlogYearArchiveView, + custom_index, + last_name, + query, +) extra_context = {} diff --git a/www/conservancy/apps/blog/views.py b/www/conservancy/apps/blog/views.py index 06f4c65a2f31edd3005879ffcdac6639a2d1f891..4d3cdc9da530ee00b499a596c9e7c9c614531b0f 100644 --- a/www/conservancy/apps/blog/views.py +++ b/www/conservancy/apps/blog/views.py @@ -1,13 +1,18 @@ from datetime import datetime from functools import reduce -from django.views.generic import ListView -from django.views.generic.dates import YearArchiveView, MonthArchiveView, DayArchiveView, DateDetailView -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.shortcuts import get_object_or_404, render +from django.views.generic import ListView +from django.views.generic.dates import ( + DateDetailView, + DayArchiveView, + MonthArchiveView, + YearArchiveView, +) -from .models import Entry, EntryTag from ..staff.models import Person +from .models import Entry, EntryTag def OR_filter(field_name, objs): diff --git a/www/conservancy/apps/contacts/models.py b/www/conservancy/apps/contacts/models.py index 4cd4d1efeb58714a8c29ad47518152f805469b1a..14ac74848d12e310d4ab824e8337b1c65810fccd 100644 --- a/www/conservancy/apps/contacts/models.py +++ b/www/conservancy/apps/contacts/models.py @@ -1,5 +1,6 @@ from django.db import models + class ContactEntry(models.Model): """Conservancy contact system diff --git a/www/conservancy/apps/contacts/urls.py b/www/conservancy/apps/contacts/urls.py index 64d53300a36da3c65821ae48327eefa1f002ed86..e344847bd53ad89dd10f2375f42bbb8522707bdb 100644 --- a/www/conservancy/apps/contacts/urls.py +++ b/www/conservancy/apps/contacts/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url, include +from django.conf.urls import include, patterns, url urlpatterns = patterns('conservancy.apps.contacts.views', (r'^/?$', 'subscribe'), diff --git a/www/conservancy/apps/contacts/views.py b/www/conservancy/apps/contacts/views.py index a727bdfad71a0f6a2cdc0f64af36f9e0d09e0acd..154251a872d93b44a2e1ef68548572ef409a9c29 100644 --- a/www/conservancy/apps/contacts/views.py +++ b/www/conservancy/apps/contacts/views.py @@ -1,6 +1,6 @@ -from django.shortcuts import render from django import forms from django.forms import ModelForm +from django.shortcuts import render from .models import ContactEntry diff --git a/www/conservancy/apps/contractpatch/urls.py b/www/conservancy/apps/contractpatch/urls.py index fc1be6ecd6b2bbd51e7cdadfe6b352a399328ce2..8943efb944569ba468d163f395e083cd753803f4 100644 --- a/www/conservancy/apps/contractpatch/urls.py +++ b/www/conservancy/apps/contractpatch/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url, include +from django.conf.urls import include, url from . import views as cpatch_views diff --git a/www/conservancy/apps/events/admin.py b/www/conservancy/apps/events/admin.py index 6a2a95f96fa2b336805debdfac1810eaf523a52a..0d4f8196b9c1faf861438515979d3cfe3ae23207 100644 --- a/www/conservancy/apps/events/admin.py +++ b/www/conservancy/apps/events/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import EventTag, Event, EventMedia +from .models import Event, EventMedia, EventTag admin.site.register(EventTag) diff --git a/www/conservancy/apps/events/urls.py b/www/conservancy/apps/events/urls.py index ab146e48fcdcc379ad4d9179eedb6369327f3ab7..addc19bcc4e9d1109bbdf3a260eda6167b35ec5b 100644 --- a/www/conservancy/apps/events/urls.py +++ b/www/conservancy/apps/events/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url, include +from django.conf.urls import include, patterns, url from .models import Event diff --git a/www/conservancy/apps/events/views.py b/www/conservancy/apps/events/views.py index 5e10b8139c019d768e9c6236edf8c6e83e0ed3b1..5c91d425c8b708d80f461681f2ef40e7f075ff34 100644 --- a/www/conservancy/apps/events/views.py +++ b/www/conservancy/apps/events/views.py @@ -1,8 +1,8 @@ # from django.views.generic.list_detail import object_list -from django.shortcuts import render +from django.core.exceptions import ObjectDoesNotExist from django.http import Http404, HttpResponse +from django.shortcuts import render from django.template import loader -from django.core.exceptions import ObjectDoesNotExist from .models import Event diff --git a/www/conservancy/apps/fossy/migrations/0001_initial.py b/www/conservancy/apps/fossy/migrations/0001_initial.py index 725cfbbe1a26e4b8d3293d20727df18c299a376b..d339c95320754b96d7f4caa4917557114ab79f11 100644 --- a/www/conservancy/apps/fossy/migrations/0001_initial.py +++ b/www/conservancy/apps/fossy/migrations/0001_initial.py @@ -1,8 +1,9 @@ # Generated by Django 1.11.29 on 2023-01-27 06:19 -from django.db import migrations, models import uuid +from django.db import migrations, models + class Migration(migrations.Migration): diff --git a/www/conservancy/apps/fossy/urls.py b/www/conservancy/apps/fossy/urls.py index b26789ae998dc22adbf065e0c4836ddee2b9e257..fbbabd19cac27bf1b6a10b36ece14c13fb73a1be 100644 --- a/www/conservancy/apps/fossy/urls.py +++ b/www/conservancy/apps/fossy/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import url from .views import CommunityTrackProposalCreateView, CommunityTrackProposalThanksView - urlpatterns = [ url(r'^community-tracks/$', CommunityTrackProposalCreateView.as_view(), name='fossy-add'), url(r'^(?P[\w-]+)/$', CommunityTrackProposalThanksView.as_view(), name='fossy-thanks'), diff --git a/www/conservancy/apps/news/admin.py b/www/conservancy/apps/news/admin.py index fbecace3143fe54f00bef2c07824fa044467f28a..49bc647bdfd281a7e5b742b25941c118dc9a56f9 100644 --- a/www/conservancy/apps/news/admin.py +++ b/www/conservancy/apps/news/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import PressRelease, ExternalArticleTag, ExternalArticle +from .models import ExternalArticle, ExternalArticleTag, PressRelease class PressReleaseAdmin(admin.ModelAdmin): diff --git a/www/conservancy/apps/news/models.py b/www/conservancy/apps/news/models.py index c51ea69b796659bc7c2d6d141fbe911d0d84269d..b19cea09e751df8e5c804008bf125fa7aef31b79 100644 --- a/www/conservancy/apps/news/models.py +++ b/www/conservancy/apps/news/models.py @@ -1,12 +1,12 @@ from datetime import datetime, timedelta -from django.db import models from django.conf import settings from django.contrib.sites.models import Site +from django.db import models from ... import bsoup -from ..staff.models import Person from ..events.models import Event +from ..staff.models import Person class PressRelease(models.Model, bsoup.SoupModelMixin): diff --git a/www/conservancy/apps/news/templatetags/date_within.py b/www/conservancy/apps/news/templatetags/date_within.py index 5213759d2093aea11eac34d56619ecdb7be9fb80..207bca71c7f74095ea29581ad2809219711ee6cf 100644 --- a/www/conservancy/apps/news/templatetags/date_within.py +++ b/www/conservancy/apps/news/templatetags/date_within.py @@ -1,5 +1,6 @@ +from datetime import datetime, timedelta + from django import template -from datetime import timedelta, datetime register = template.Library() diff --git a/www/conservancy/apps/news/templatetags/min.py b/www/conservancy/apps/news/templatetags/min.py index f54c4616f4ad2d27e8ed3e1ed25d7e80f3cb7fc6..632d83699248061c97d1d695b3636d00db80bf79 100644 --- a/www/conservancy/apps/news/templatetags/min.py +++ b/www/conservancy/apps/news/templatetags/min.py @@ -1,4 +1,5 @@ from django import template + register = template.Library() @register.filter diff --git a/www/conservancy/apps/news/templatetags/subtract.py b/www/conservancy/apps/news/templatetags/subtract.py index f79c514fbd2c4c327bb0c73b5616a16d7263954e..111daffc204528f3b78a589c3c8ed3f81ca1185a 100644 --- a/www/conservancy/apps/news/templatetags/subtract.py +++ b/www/conservancy/apps/news/templatetags/subtract.py @@ -1,4 +1,5 @@ from django import template + register = template.Library() @register.filter diff --git a/www/conservancy/apps/news/urls.py b/www/conservancy/apps/news/urls.py index f7ac8e7c6bc2a9f58a18f37cc0fa9db06bec2d4c..33b57f74f7464f99d04347f732b80c344b19f432 100644 --- a/www/conservancy/apps/news/urls.py +++ b/www/conservancy/apps/news/urls.py @@ -17,11 +17,17 @@ # along with this program in a file in the toplevel directory called # "AGPLv3". If not, see . -from django.conf.urls import url, include from django.conf import settings +from django.conf.urls import include, url -from .models import PressRelease, ExternalArticle -from .views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView, listing +from .models import ExternalArticle, PressRelease +from .views import ( + NewsDateDetailView, + NewsDayArchiveView, + NewsMonthArchiveView, + NewsYearArchiveView, + listing, +) info_dict = { 'queryset': PressRelease.objects.all().filter(sites__id__exact=settings.SITE_ID), diff --git a/www/conservancy/apps/news/views.py b/www/conservancy/apps/news/views.py index bae3cefb2ae2dcb05c7c6343c838b659df146644..a1533b6a1193fd135f067251fc5e60af5f8c14a9 100644 --- a/www/conservancy/apps/news/views.py +++ b/www/conservancy/apps/news/views.py @@ -1,14 +1,18 @@ from datetime import datetime -from django.views.generic import ListView -from django.shortcuts import render -from django.views.generic.dates import YearArchiveView, MonthArchiveView, DayArchiveView, DateDetailView -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.http import HttpResponse +from django.shortcuts import render +from django.views.generic import ListView +from django.views.generic.dates import ( + DateDetailView, + DayArchiveView, + MonthArchiveView, + YearArchiveView, +) -from .models import ExternalArticle -from .models import PressRelease from ..events.models import Event +from .models import ExternalArticle, PressRelease class NewsListView(ListView): diff --git a/www/conservancy/apps/staff/models.py b/www/conservancy/apps/staff/models.py index 98284b8dfcc5e8f32873cb38d83cc2e0ac363946..8b194e645566f04516b3353a6a50e1a684eb0846 100644 --- a/www/conservancy/apps/staff/models.py +++ b/www/conservancy/apps/staff/models.py @@ -1,5 +1,6 @@ from django.db import models + class Person(models.Model): """Staff members diff --git a/www/conservancy/apps/summit_registration/models.py b/www/conservancy/apps/summit_registration/models.py index 1bb0dc95a7ae348d116b0674797657b7d2cc3a74..ae2e8b3a22aeedd9e92d74b30b93c3531cf7d33d 100644 --- a/www/conservancy/apps/summit_registration/models.py +++ b/www/conservancy/apps/summit_registration/models.py @@ -1,5 +1,6 @@ from django.db import models + class SummitRegistration(models.Model): """Form fields for summit registrants""" diff --git a/www/conservancy/apps/summit_registration/urls.py b/www/conservancy/apps/summit_registration/urls.py index 1597b0efd881277ee3ed328f99dffcfcbd000aeb..7542bcec1b062c4e5dafad5048bb41991ad35008 100644 --- a/www/conservancy/apps/summit_registration/urls.py +++ b/www/conservancy/apps/summit_registration/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url, include +from django.conf.urls import include, patterns, url urlpatterns = patterns('conservancy.apps.summit_registration.views', (r'^/?$', 'register'), diff --git a/www/conservancy/apps/summit_registration/views.py b/www/conservancy/apps/summit_registration/views.py index 2dcf13951985a3dad79af8d0fb625b9c6d325b08..8fe75929165cea43625239fc7d7c5250c035b4d8 100644 --- a/www/conservancy/apps/summit_registration/views.py +++ b/www/conservancy/apps/summit_registration/views.py @@ -1,6 +1,7 @@ -from django.shortcuts import render -from django import forms from conervancy.apps.summit_registration.models import SummitRegistration +from django import forms +from django.shortcuts import render + def register(request): """Summit registration form view diff --git a/www/conservancy/apps/supporters/models.py b/www/conservancy/apps/supporters/models.py index a9bf062ed575486723bce1cde42ea2a49faa420e..08cb71b501be655a3f421d39a35f7f20cfb6864e 100644 --- a/www/conservancy/apps/supporters/models.py +++ b/www/conservancy/apps/supporters/models.py @@ -1,5 +1,6 @@ from django.db import models + class Supporter(models.Model): """Conservancy Supporter listing""" diff --git a/www/conservancy/apps/worldmap/models.py b/www/conservancy/apps/worldmap/models.py index 9a147d4ff4564b56b87ffa96a4a1318f0d86c884..107020f99fed507ddae2cd56cf5c031411b03ede 100644 --- a/www/conservancy/apps/worldmap/models.py +++ b/www/conservancy/apps/worldmap/models.py @@ -1,5 +1,6 @@ from django.db import models + class EarthLocation(models.Model): """Represents latitude and longitude, with a label""" diff --git a/www/conservancy/bsoup.py b/www/conservancy/bsoup.py index b2565ec35b54e5cf92f0795bc395fc3b63cafd92..5142afe6cbf7d97e1238ff601778aef2a49a67c8 100644 --- a/www/conservancy/bsoup.py +++ b/www/conservancy/bsoup.py @@ -5,6 +5,7 @@ import re import bs4 import bs4.element + class BeautifulSoup(bs4.BeautifulSoup): """A wrapper of the original BeautifulSoup class, with convenience methods added.""" diff --git a/www/conservancy/static/projects/policies/publish-policy.py b/www/conservancy/static/projects/policies/publish-policy.py index 05d2abf3ca49cc963a5555d9a814e7b8aa90a120..f9ffb25eb2afe5c8c836caf679c1f29d0a4ad9bb 100755 --- a/www/conservancy/static/projects/policies/publish-policy.py +++ b/www/conservancy/static/projects/policies/publish-policy.py @@ -13,9 +13,9 @@ import tempfile try: import markdown - from markdown.extensions import tables as mdx_tables from markdown.extensions import sane_lists as mdx_sane_lists from markdown.extensions import smarty as mdx_smarty + from markdown.extensions import tables as mdx_tables from markdown.extensions import toc as mdx_toc markdown_import_success = True except ImportError: diff --git a/www/conservancy/static/views.py b/www/conservancy/static/views.py index 31db72f48b25470dec0206ec92ee51506fc03754..34037a3251c417313b3649e676d821ebd1ca258d 100644 --- a/www/conservancy/static/views.py +++ b/www/conservancy/static/views.py @@ -1,5 +1,6 @@ import mimetypes import os.path + from django.http import HttpResponse from django.template.response import TemplateResponse diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py index ab7cb06b435b0fd04d048cbc6cf1e9275320e86e..1c44ba72ba8f483da3850ba972c2b9809718bea9 100644 --- a/www/conservancy/urls.py +++ b/www/conservancy/urls.py @@ -17,7 +17,7 @@ # along with this program in a file in the toplevel directory called # "AGPLv3". If not, see . -from django.conf.urls import url, include +from django.conf.urls import include, url from django.contrib import admin from . import feeds, frontpage, sponsors diff --git a/www/conservancy_ssl_wrapper.py b/www/conservancy_ssl_wrapper.py index 218f082326c02225753adbe4eb84e1d8a16c1527..bf84070899f1afb47fb5c7e3ea721e3051e5e679 100644 --- a/www/conservancy_ssl_wrapper.py +++ b/www/conservancy_ssl_wrapper.py @@ -21,6 +21,7 @@ # so we just bypass it altogether and set the relevant variable here. # See deployment documentation for more info. from os import environ + environ["DJANGO_SETTINGS_MODULE"] = 'conservancy_ssl.settings' environ["CANONICAL_HOSTNAME"] = 'sfconservancy.org' diff --git a/www/conservancy_wrapper.py b/www/conservancy_wrapper.py index 25903d893371dc82b57306bc962bdbdd8d13b191..7456806213b599daf1b181784e10c8ed93d8c6f4 100644 --- a/www/conservancy_wrapper.py +++ b/www/conservancy_wrapper.py @@ -2,6 +2,7 @@ # so we just bypass it altogether and set the relevant variable here. # See deployment documentation for more info. from os import environ + environ["DJANGO_SETTINGS_MODULE"] = 'conservancy.settings' environ["CANONICAL_HOSTNAME"] = 'sfconservancy.org' diff --git a/www/modpythoncustom.py b/www/modpythoncustom.py index 5041e03861cf02eace77080d9711c9bb994fd426..d3234566f95522c24c8124b6ce6eb5d8e2497087 100644 --- a/www/modpythoncustom.py +++ b/www/modpythoncustom.py @@ -1,5 +1,6 @@ from mod_python import apache + # 404 should do NOTHING so apache can handle it. This view is referenced # in sflc.urls def view404(request): @@ -30,6 +31,8 @@ def outputfilter(filter): if s is None: filter.close() +from django.core.handlers.modpython import * + # This is unreferenced from this file, but it must be imported to # enable template inheritance in the outputfilter! import django.template.loader @@ -37,7 +40,6 @@ import django.template.loader # And now we override a few things in the module # django.core.handlers.modpython -from django.core.handlers.modpython import * del handler class ModPythonRequest(ModPythonRequest): diff --git a/www/podjango/admin.py b/www/podjango/admin.py index b9623202f4632b8145dfbe8ed8eb1415f0df2e3f..aa7766209baf55d5f4c48019e376592fa4ca6a2f 100644 --- a/www/podjango/admin.py +++ b/www/podjango/admin.py @@ -18,7 +18,8 @@ # from django.contrib import admin -from .models import CastTag, Cast +from .models import Cast, CastTag + class CastTagAdmin(admin.ModelAdmin): prepopulated_fields = {'slug': ('label',)} diff --git a/www/podjango/feeds.py b/www/podjango/feeds.py index 7d674b2898964d03fe7721af396c1be66575f38d..7c4b84e463bb880844a53c022ad7bcd354bb258d 100644 --- a/www/podjango/feeds.py +++ b/www/podjango/feeds.py @@ -21,11 +21,11 @@ from datetime import datetime import itertools import operator +from django.conf import settings from django.contrib.sites.shortcuts import get_current_site -from django.contrib.syndication.views import add_domain, Feed -from django.utils.feedgenerator import Rss201rev2Feed +from django.contrib.syndication.views import Feed, add_domain from django.shortcuts import render -from django.conf import settings +from django.utils.feedgenerator import Rss201rev2Feed from .models import Cast diff --git a/www/podjango/frontpage.py b/www/podjango/frontpage.py index d0faa3fd5d7d2c041acf5bcf90ad6de323fd0e8f..68604dde07daef776bb9275cfd4f1089c6856f6e 100644 --- a/www/podjango/frontpage.py +++ b/www/podjango/frontpage.py @@ -17,11 +17,13 @@ # along with this program in a file in the toplevel directory called # "AGPLv3". If not, see . -from django.shortcuts import render from datetime import datetime, timedelta +from django.shortcuts import render + from .models import Cast + def view(request): """Cast front page view Performs all object queries necessary to render the front page. diff --git a/www/podjango/models.py b/www/podjango/models.py index 607ad74e56c30758c5e9b0562258ed4e991ec054..53c3db52b2c55db0f3a0ed26373d797c29427065 100644 --- a/www/podjango/models.py +++ b/www/podjango/models.py @@ -16,10 +16,11 @@ # along with this program in a file in the toplevel directory called # "AGPLv3". If not, see . # -from django.db import models +from datetime import datetime, timedelta + from django.conf import settings +from django.db import models from django.urls import reverse -from datetime import datetime, timedelta class CastTag(models.Model): diff --git a/www/podjango/templatetags/date_within.py b/www/podjango/templatetags/date_within.py index 5213759d2093aea11eac34d56619ecdb7be9fb80..207bca71c7f74095ea29581ad2809219711ee6cf 100644 --- a/www/podjango/templatetags/date_within.py +++ b/www/podjango/templatetags/date_within.py @@ -1,5 +1,6 @@ +from datetime import datetime, timedelta + from django import template -from datetime import timedelta, datetime register = template.Library() diff --git a/www/podjango/urls.py b/www/podjango/urls.py index 4ef3ded76d4c382fccc71d1e73cdf47731690ef7..bd27d9c7221c72a8731390182122fba62dad4450 100644 --- a/www/podjango/urls.py +++ b/www/podjango/urls.py @@ -18,13 +18,18 @@ # "AGPLv3". If not, see . from django.conf import settings -from django.conf.urls import url, include +from django.conf.urls import include, url from django.contrib import admin from django.contrib.syndication.views import Feed -from django.views.generic.dates import DateDetailView, DayArchiveView, MonthArchiveView, YearArchiveView +from django.views.generic.dates import ( + DateDetailView, + DayArchiveView, + MonthArchiveView, + YearArchiveView, +) from . import frontpage -from .feeds import feed_dict, view, Mp3CastFeed, OggCastFeed +from .feeds import Mp3CastFeed, OggCastFeed, feed_dict, view from .models import Cast, CastTag from .views import custom_index, query diff --git a/www/podjango/views.py b/www/podjango/views.py index 14af20ac7dab084677fa7d07e5a1e4dab578c9cc..359ce81021e2bc5d6813f693db7e1e0072198960 100644 --- a/www/podjango/views.py +++ b/www/podjango/views.py @@ -19,8 +19,8 @@ from datetime import datetime from functools import reduce -from django.views.generic.list import ListView from django.shortcuts import get_object_or_404, render +from django.views.generic.list import ListView from .models import Cast, CastTag