website Changeset - 47a30a750ad1 · Conservancy Kallithea

Changeset - 47a30a750ad1

Parent rev.

Child rev.

[Not reviewed]

0 45 0

Ben Sturmfels (bsturmfels) - 7 months ago 2023-10-19 22:52:39
ben@sturm.com.au

Sort Python imports with isort

45 files changed with 103 insertions and 51 deletions:

www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py

www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py

www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py

www/conservancy/apps/assignment/urls.py

www/conservancy/apps/assignment/views.py

www/conservancy/apps/blog/admin.py

www/conservancy/apps/blog/models.py

www/conservancy/apps/blog/urls.py

www/conservancy/apps/blog/views.py

www/conservancy/apps/contacts/models.py

www/conservancy/apps/contacts/urls.py

www/conservancy/apps/contacts/views.py

www/conservancy/apps/contractpatch/urls.py

www/conservancy/apps/events/admin.py

www/conservancy/apps/events/urls.py

www/conservancy/apps/events/views.py

www/conservancy/apps/fossy/migrations/0001_initial.py

www/conservancy/apps/fossy/urls.py

www/conservancy/apps/news/admin.py

www/conservancy/apps/news/models.py

www/conservancy/apps/news/templatetags/date_within.py

www/conservancy/apps/news/templatetags/min.py

www/conservancy/apps/news/templatetags/subtract.py

www/conservancy/apps/news/urls.py

www/conservancy/apps/news/views.py

www/conservancy/apps/staff/models.py

www/conservancy/apps/summit_registration/models.py

www/conservancy/apps/summit_registration/urls.py

www/conservancy/apps/summit_registration/views.py

www/conservancy/apps/supporters/models.py

www/conservancy/apps/worldmap/models.py

www/conservancy/bsoup.py

www/conservancy/static/projects/policies/publish-policy.py

www/conservancy/static/views.py

www/conservancy/urls.py

www/conservancy_ssl_wrapper.py

www/conservancy_wrapper.py

www/modpythoncustom.py

www/podjango/admin.py

www/podjango/feeds.py

www/podjango/frontpage.py

www/podjango/models.py

www/podjango/templatetags/date_within.py

www/podjango/urls.py

www/podjango/views.py

0 comments (0 inline, 0 general)

www/conservancy/apps/assignment/migrations/0002_auto_20211206_2237.py

➞

Show inline comments

...		@@ -3,2 +3,3 @@
		import datetime

		from django.db import migrations, models

www/conservancy/apps/assignment/migrations/0003_auto_20211206_2249.py

➞

Show inline comments

@@ ... / @@ -2,5 +2,6 @@ @@
 from django.db import migrations, models
 import uuid
 from django.db import migrations, models

www/conservancy/apps/assignment/migrations/0004_auto_20230127_0602.py

➞

Show inline comments

@@ ... / @@ -3,4 +3,6 @@ @@
 from django.db import migrations, models
 from ..models import validate_mutiple_urls
 class Migration(migrations.Migration):

www/conservancy/apps/assignment/urls.py

➞

Show inline comments

...		@@ -4,3 +4,2 @@ from .views import AssignmentCreateView, AssignmentThanksView


		urlpatterns = [

www/conservancy/apps/assignment/views.py

➞

Show inline comments

...		@@ -8,2 +8,3 @@ from .models import Assignment


		class AssignmentCreateView(CreateView):

www/conservancy/apps/blog/admin.py

➞

Show inline comments

...		@@ -2,3 +2,3 @@ from django.contrib import admin

		from .models import ~~EntryTag~~, ~~Entry~~
		from .models import Entry, EntryTag

www/conservancy/apps/blog/models.py

➞

Show inline comments

@@ ... / @@ -2,4 +2,4 @@ from datetime import datetime, timedelta @@
 from django.db import models
 from django.conf import settings
 from django.db import models

www/conservancy/apps/blog/urls.py

➞

Show inline comments

@@ ... / @@ -2,7 +2,15 @@ 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,
+)

www/conservancy/apps/blog/views.py

➞

Show inline comments

@@ ... / @@ -3,9 +3,14 @@ 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

www/conservancy/apps/contacts/models.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ from django.db import models


		class ContactEntry(models.Model):

www/conservancy/apps/contacts/urls.py

➞

Show inline comments

		from django.conf.urls import patterns, url~~, include~~
		from django.conf.urls import include, patterns, url

www/conservancy/apps/contacts/views.py

➞

Show inline comments

 from django.shortcuts import render
 from django import forms
 from django.forms import ModelForm
 from django.shortcuts import render

www/conservancy/apps/contractpatch/urls.py

➞

Show inline comments

		from django.conf.urls import ~~url~~, ~~include~~
		from django.conf.urls import include, url

www/conservancy/apps/events/admin.py

➞

Show inline comments

...		@@ -2,3 +2,3 @@ from django.contrib import admin

		from .models import ~~EventTag,~~ Event, EventMedia
		from .models import Event, EventMedia, EventTag

www/conservancy/apps/events/urls.py

➞

Show inline comments

		from django.conf.urls import patterns, url~~, include~~
		from django.conf.urls import include, patterns, url

www/conservancy/apps/events/views.py

➞

Show inline comments

 # 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

www/conservancy/apps/fossy/migrations/0001_initial.py

➞

Show inline comments

@@ ... / @@ -2,5 +2,6 @@ @@
 from django.db import migrations, models
 import uuid
 from django.db import migrations, models

www/conservancy/apps/fossy/urls.py

➞

Show inline comments

...		@@ -4,3 +4,2 @@ from .views import CommunityTrackProposalCreateView, CommunityTrackProposalThank


		urlpatterns = [

www/conservancy/apps/news/admin.py

➞

Show inline comments

...		@@ -2,3 +2,3 @@ from django.contrib import admin

		from .models import ~~PressRelease~~, ExternalArticleTag, ~~ExternalArticle~~
		from .models import ExternalArticle, ExternalArticleTag, PressRelease

www/conservancy/apps/news/models.py

➞

Show inline comments

@@ ... / @@ -2,9 +2,9 @@ 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

www/conservancy/apps/news/templatetags/date_within.py

➞

Show inline comments

 from datetime import datetime, timedelta
 from django import template
 from datetime import timedelta, datetime

www/conservancy/apps/news/templatetags/min.py

➞

Show inline comments

		from django import template

		register = template.Library()

www/conservancy/apps/news/templatetags/subtract.py

➞

Show inline comments

		from django import template

		register = template.Library()

www/conservancy/apps/news/urls.py

➞

Show inline comments

@@ ... / @@ -19,7 +19,13 @@ @@
 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,
+)

www/conservancy/apps/news/views.py

➞

Show inline comments

@@ ... / @@ -2,11 +2,15 @@ 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

www/conservancy/apps/staff/models.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ from django.db import models


		class Person(models.Model):

www/conservancy/apps/summit_registration/models.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ from django.db import models


		class SummitRegistration(models.Model):

www/conservancy/apps/summit_registration/urls.py

➞

Show inline comments

		from django.conf.urls import patterns, url~~, include~~
		from django.conf.urls import include, patterns, url

www/conservancy/apps/summit_registration/views.py

➞

Show inline comments

 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

www/conservancy/apps/supporters/models.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ from django.db import models


		class Supporter(models.Model):

www/conservancy/apps/worldmap/models.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ from django.db import models


		class EarthLocation(models.Model):

www/conservancy/bsoup.py

➞

Show inline comments

...		@@ -7,2 +7,3 @@ import bs4.element


		class BeautifulSoup(bs4.BeautifulSoup):

www/conservancy/static/projects/policies/publish-policy.py

➞

Show inline comments

@@ ... / @@ -15,5 +15,5 @@ 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

www/conservancy/static/views.py

➞

Show inline comments

...		@@ -2,2 +2,3 @@ import mimetypes
		import os.path

		from django.http import HttpResponse

www/conservancy/urls.py

➞

Show inline comments

@@ ... / @@ -19,3 +19,3 @@ @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 from django.contrib import admin

www/conservancy_ssl_wrapper.py

➞

Show inline comments

...		@@ -23,2 +23,3 @@
		from os import environ

		environ["DJANGO_SETTINGS_MODULE"] = 'conservancy_ssl.settings'

www/conservancy_wrapper.py

➞

Show inline comments

...		@@ -4,2 +4,3 @@
		from os import environ

		environ["DJANGO_SETTINGS_MODULE"] = 'conservancy.settings'

www/modpythoncustom.py

➞

Show inline comments

@@ ... / @@ -2,2 +2,3 @@ from mod_python import apache @@
 # 404 should do NOTHING so apache can handle it.  This view is referenced
@@ ... / @@ -32,2 +33,4 @@ def outputfilter(filter): @@
 from django.core.handlers.modpython import *
 # This is unreferenced from this file, but it must be imported to
@@ ... / @@ -39,3 +42,2 @@ import django.template.loader @@
 from django.core.handlers.modpython import *
 del handler

www/podjango/admin.py

➞

Show inline comments

...		@@ -20,3 +20,4 @@ from django.contrib import admin

		from .models import CastTag, Cast
		from .models import Cast, CastTag

www/podjango/feeds.py

➞

Show inline comments

@@ ... / @@ -23,7 +23,7 @@ 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

www/podjango/frontpage.py

➞

Show inline comments

@@ ... / @@ -19,7 +19,9 @@ @@
 from django.shortcuts import render
 from datetime import datetime, timedelta
 from django.shortcuts import render
 from .models import Cast
 def view(request):

www/podjango/models.py

➞

Show inline comments

@@ ... / @@ -18,6 +18,7 @@ @@
+#
 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

www/podjango/templatetags/date_within.py

➞

Show inline comments

 from datetime import datetime, timedelta
 from django import template
 from datetime import timedelta, datetime

www/podjango/urls.py

➞

Show inline comments

@@ ... / @@ -20,9 +20,14 @@ @@
 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

www/podjango/views.py

➞

Show inline comments

@@ ... / @@ -21,4 +21,4 @@ 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

0 comments (0 inline, 0 general)