From 00c5b6cded8140e789dd3e3157afdd0fa452e972 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar <theskumar@users.noreply.github.com> Date: Sat, 23 Jul 2022 18:41:35 +0530 Subject: [PATCH] Run isort --- hypha/apply/categories/models.py | 2 +- hypha/apply/dashboard/wagtail_hooks.py | 2 +- hypha/apply/funds/admin_views.py | 2 +- hypha/apply/funds/wagtail_hooks.py | 2 +- hypha/public/forms/models.py | 7 +------ hypha/public/navigation/models.py | 2 +- hypha/public/partner/models.py | 4 ++-- hypha/public/people/management/commands/migrate_people.py | 2 +- hypha/public/people/models.py | 2 +- .../projects/management/commands/migrate_projects.py | 2 +- hypha/public/utils/models.py | 4 ++-- hypha/public/utils/templatetags/util_tags.py | 2 +- hypha/public/utils/wagtail_hooks.py | 2 +- hypha/urls.py | 2 +- 14 files changed, 16 insertions(+), 21 deletions(-) diff --git a/hypha/apply/categories/models.py b/hypha/apply/categories/models.py index 5ca8d8240..f65f86798 100644 --- a/hypha/apply/categories/models.py +++ b/hypha/apply/categories/models.py @@ -6,8 +6,8 @@ from django.utils.translation import gettext_lazy as _ from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel from treebeard.mp_tree import MP_Node -from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.admin.forms import WagtailAdminModelForm +from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.fields import RichTextField from wagtail.models import Orderable from wagtail.search import index diff --git a/hypha/apply/dashboard/wagtail_hooks.py b/hypha/apply/dashboard/wagtail_hooks.py index 6e776313f..4925637e2 100644 --- a/hypha/apply/dashboard/wagtail_hooks.py +++ b/hypha/apply/dashboard/wagtail_hooks.py @@ -1,8 +1,8 @@ from urllib.parse import urljoin from django.urls import reverse -from wagtail.admin.menu import MenuItem from wagtail import hooks +from wagtail.admin.menu import MenuItem from hypha.apply.home.models import ApplyHomePage diff --git a/hypha/apply/funds/admin_views.py b/hypha/apply/funds/admin_views.py index 093f38bad..8e6344c49 100644 --- a/hypha/apply/funds/admin_views.py +++ b/hypha/apply/funds/admin_views.py @@ -2,11 +2,11 @@ from django.contrib.admin.utils import unquote from django.core.exceptions import PermissionDenied from django.shortcuts import get_object_or_404, redirect from django.utils.translation import gettext as _ +from wagtail import hooks from wagtail.admin import messages from wagtail.admin.forms.pages import CopyForm from wagtail.admin.views.pages.utils import get_valid_next_url_from_request from wagtail.contrib.modeladmin.views import CreateView, EditView -from wagtail import hooks from wagtail.models import Page from hypha.apply.utils.blocks import show_admin_form_error_messages diff --git a/hypha/apply/funds/wagtail_hooks.py b/hypha/apply/funds/wagtail_hooks.py index 35cbe05b8..31debfeb0 100644 --- a/hypha/apply/funds/wagtail_hooks.py +++ b/hypha/apply/funds/wagtail_hooks.py @@ -1,6 +1,6 @@ from django.contrib.auth.models import Permission -from wagtail.contrib.modeladmin.options import modeladmin_register from wagtail import hooks +from wagtail.contrib.modeladmin.options import modeladmin_register from .admin import ApplyAdminGroup from .admin_views import custom_admin_round_copy_view diff --git a/hypha/public/forms/models.py b/hypha/public/forms/models.py index f10f76ba0..7c85d556d 100644 --- a/hypha/public/forms/models.py +++ b/hypha/public/forms/models.py @@ -10,12 +10,7 @@ from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _ from django.views.decorators.cache import never_cache from modelcluster.fields import ParentalKey -from wagtail.admin.panels import ( - FieldPanel, - FieldRowPanel, - InlinePanel, - MultiFieldPanel, -) +from wagtail.admin.panels import FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel from wagtail.contrib.forms.forms import FormBuilder from wagtail.contrib.forms.models import ( FORM_FIELD_CHOICES, diff --git a/hypha/public/navigation/models.py b/hypha/public/navigation/models.py index bb2069289..79fa4a4d2 100644 --- a/hypha/public/navigation/models.py +++ b/hypha/public/navigation/models.py @@ -1,8 +1,8 @@ from django.utils.translation import gettext_lazy as _ from modelcluster.models import ClusterableModel +from wagtail import blocks from wagtail.admin.panels import StreamFieldPanel from wagtail.contrib.settings.models import BaseSetting, register_setting -from wagtail import blocks from wagtail.fields import StreamField diff --git a/hypha/public/partner/models.py b/hypha/public/partner/models.py index 4ce4903a0..4c7d128fb 100644 --- a/hypha/public/partner/models.py +++ b/hypha/public/partner/models.py @@ -8,12 +8,12 @@ from django.http import Http404 from django.shortcuts import redirect from django.utils.translation import gettext_lazy as _ from pagedown.widgets import PagedownWidget -from wagtail.admin.panels import FieldPanel from wagtail.admin.forms import WagtailAdminModelForm +from wagtail.admin.panels import FieldPanel from wagtail.contrib.settings.models import BaseSetting, register_setting from wagtail.fields import RichTextField -from wagtail.models import Page from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.models import Page from wagtail.search import index from hypha.apply.categories.models import Category, Option diff --git a/hypha/public/people/management/commands/migrate_people.py b/hypha/public/people/management/commands/migrate_people.py index a76ce2dc1..93f145022 100644 --- a/hypha/public/people/management/commands/migrate_people.py +++ b/hypha/public/people/management/commands/migrate_people.py @@ -14,9 +14,9 @@ from django.db import transaction from django.db.utils import IntegrityError from PIL import Image from wagtail.admin.rich_text.converters.editor_html import EditorHTMLConverter +from wagtail.images import get_image_model from wagtail.models import Page from wagtail.rich_text import RichText -from wagtail.images import get_image_model from hypha.apply.categories.categories_seed import CATEGORIES from hypha.apply.categories.models import Category, Option diff --git a/hypha/public/people/models.py b/hypha/public/people/models.py index 66a61b886..9f7183b1a 100644 --- a/hypha/public/people/models.py +++ b/hypha/public/people/models.py @@ -14,8 +14,8 @@ from wagtail.admin.panels import ( StreamFieldPanel, ) from wagtail.fields import StreamField -from wagtail.models import Orderable, PageManager from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.models import Orderable, PageManager from wagtail.query import PageQuerySet from wagtail.search import index diff --git a/hypha/public/projects/management/commands/migrate_projects.py b/hypha/public/projects/management/commands/migrate_projects.py index ff75e1720..fc0cc0734 100644 --- a/hypha/public/projects/management/commands/migrate_projects.py +++ b/hypha/public/projects/management/commands/migrate_projects.py @@ -14,9 +14,9 @@ from django.db import transaction from django.db.utils import IntegrityError from PIL import Image from wagtail.admin.rich_text.converters.editor_html import EditorHTMLConverter +from wagtail.images import get_image_model from wagtail.models import Page from wagtail.rich_text import RichText -from wagtail.images import get_image_model from hypha.apply.categories.categories_seed import CATEGORIES from hypha.apply.categories.models import Category, Option diff --git a/hypha/public/utils/models.py b/hypha/public/utils/models.py index f5b5f8c64..48ceca076 100644 --- a/hypha/public/utils/models.py +++ b/hypha/public/utils/models.py @@ -3,6 +3,7 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _ +from wagtail import blocks from wagtail.admin.panels import ( FieldPanel, FieldRowPanel, @@ -12,10 +13,9 @@ from wagtail.admin.panels import ( StreamFieldPanel, ) from wagtail.contrib.settings.models import BaseSetting, register_setting -from wagtail import blocks from wagtail.fields import RichTextField, StreamField -from wagtail.models import Orderable, Page from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.models import Orderable, Page from wagtail.snippets.models import register_snippet from wagtailcache.cache import WagtailCacheMixin, cache_page diff --git a/hypha/public/utils/templatetags/util_tags.py b/hypha/public/utils/templatetags/util_tags.py index 0e11dda0e..a54a23fd6 100644 --- a/hypha/public/utils/templatetags/util_tags.py +++ b/hypha/public/utils/templatetags/util_tags.py @@ -1,6 +1,6 @@ from django import template -from wagtail.models import Page from wagtail.coreutils import camelcase_to_underscore +from wagtail.models import Page from hypha.public.home.models import HomePage from hypha.public.utils.models import SocialMediaSettings, SystemMessagesSettings diff --git a/hypha/public/utils/wagtail_hooks.py b/hypha/public/utils/wagtail_hooks.py index c2ffbaf8f..e71427ca1 100644 --- a/hypha/public/utils/wagtail_hooks.py +++ b/hypha/public/utils/wagtail_hooks.py @@ -1,10 +1,10 @@ from django.templatetags.static import static +from wagtail import hooks from wagtail.contrib.modeladmin.options import ( ModelAdmin, ModelAdminGroup, modeladmin_register, ) -from wagtail import hooks from wagtailcache.cache import clear_cache from hypha.public.news.models import NewsType diff --git a/hypha/urls.py b/hypha/urls.py index 8d8d3e5a3..f162b6f0a 100644 --- a/hypha/urls.py +++ b/hypha/urls.py @@ -4,9 +4,9 @@ from django.urls import include, path, re_path from django.views.generic import TemplateView from django_file_form import urls as django_file_form_urls from two_factor.views import LoginView +from wagtail import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls from wagtail.contrib.sitemaps.views import sitemap -from wagtail import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls from wagtail.images.views.serve import ServeView -- GitLab