From 6732b719834fc3a7d72dfd78f684f066a1fcf11f Mon Sep 17 00:00:00 2001 From: Sage Abdullah Date: Tue, 26 Jul 2022 10:20:15 +0700 Subject: [PATCH] Format code with isort --- bakerydemo/api.py | 4 ++-- bakerydemo/base/blocks.py | 4 ++-- .../base/management/commands/load_initial_data.py | 7 +++---- bakerydemo/base/models.py | 11 ++--------- bakerydemo/base/templatetags/gallery_tags.py | 1 - bakerydemo/base/templatetags/navigation_tags.py | 2 -- bakerydemo/base/wagtail_hooks.py | 4 ++-- bakerydemo/blog/models.py | 7 ++----- bakerydemo/breads/models.py | 4 +--- bakerydemo/locations/models.py | 4 +--- bakerydemo/search/views.py | 3 +-- bakerydemo/urls.py | 10 +++++----- bakerydemo/wsgi.py | 1 - manage.py | 1 - 14 files changed, 21 insertions(+), 42 deletions(-) diff --git a/bakerydemo/api.py b/bakerydemo/api.py index 63c946f..4e1ecfa 100644 --- a/bakerydemo/api.py +++ b/bakerydemo/api.py @@ -1,7 +1,7 @@ -from wagtail.api.v2.views import PagesAPIViewSet from wagtail.api.v2.router import WagtailAPIRouter -from wagtail.images.api.v2.views import ImagesAPIViewSet +from wagtail.api.v2.views import PagesAPIViewSet from wagtail.documents.api.v2.views import DocumentsAPIViewSet +from wagtail.images.api.v2.views import ImagesAPIViewSet # Create the router. "wagtailapi" is the URL namespace api_router = WagtailAPIRouter("wagtailapi") diff --git a/bakerydemo/base/blocks.py b/bakerydemo/base/blocks.py index 132c4b1..4725eec 100644 --- a/bakerydemo/base/blocks.py +++ b/bakerydemo/base/blocks.py @@ -1,5 +1,3 @@ -from wagtail.images.blocks import ImageChooserBlock -from wagtail.embeds.blocks import EmbedBlock from wagtail.blocks import ( CharBlock, ChoiceBlock, @@ -8,6 +6,8 @@ from wagtail.blocks import ( StructBlock, TextBlock, ) +from wagtail.embeds.blocks import EmbedBlock +from wagtail.images.blocks import ImageChooserBlock class ImageBlock(StructBlock): diff --git a/bakerydemo/base/management/commands/load_initial_data.py b/bakerydemo/base/management/commands/load_initial_data.py index 64998cd..7d53ae9 100644 --- a/bakerydemo/base/management/commands/load_initial_data.py +++ b/bakerydemo/base/management/commands/load_initial_data.py @@ -1,11 +1,10 @@ import os from django.conf import settings -from django.core.files.storage import default_storage, FileSystemStorage -from django.core.management.base import BaseCommand +from django.core.files.storage import FileSystemStorage, default_storage from django.core.management import call_command - -from wagtail.models import Site, Page +from django.core.management.base import BaseCommand +from wagtail.models import Page, Site class Command(BaseCommand): diff --git a/bakerydemo/base/models.py b/bakerydemo/base/models.py index 6137f57..b36244b 100644 --- a/bakerydemo/base/models.py +++ b/bakerydemo/base/models.py @@ -1,19 +1,12 @@ from __future__ import unicode_literals from django.db import models - from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel - -from wagtail.admin.panels import ( - FieldPanel, - FieldRowPanel, - InlinePanel, - MultiFieldPanel, -) +from wagtail.admin.panels import FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel +from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField from wagtail.fields import RichTextField, StreamField from wagtail.models import Collection, Page -from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField from wagtail.search import index from wagtail.snippets.models import register_snippet diff --git a/bakerydemo/base/templatetags/gallery_tags.py b/bakerydemo/base/templatetags/gallery_tags.py index 0229c13..974f6a2 100644 --- a/bakerydemo/base/templatetags/gallery_tags.py +++ b/bakerydemo/base/templatetags/gallery_tags.py @@ -1,5 +1,4 @@ from django import template - from wagtail.images.models import Image register = template.Library() diff --git a/bakerydemo/base/templatetags/navigation_tags.py b/bakerydemo/base/templatetags/navigation_tags.py index 6f824ae..99fd7e6 100644 --- a/bakerydemo/base/templatetags/navigation_tags.py +++ b/bakerydemo/base/templatetags/navigation_tags.py @@ -1,10 +1,8 @@ from django import template - from wagtail.models import Page, Site from bakerydemo.base.models import FooterText - register = template.Library() # https://docs.djangoproject.com/en/3.2/howto/custom-template-tags/ diff --git a/bakerydemo/base/wagtail_hooks.py b/bakerydemo/base/wagtail_hooks.py index 7211c8a..3441d0c 100644 --- a/bakerydemo/base/wagtail_hooks.py +++ b/bakerydemo/base/wagtail_hooks.py @@ -4,8 +4,8 @@ from wagtail.contrib.modeladmin.options import ( modeladmin_register, ) -from bakerydemo.breads.models import Country, BreadIngredient, BreadType -from bakerydemo.base.models import People, FooterText +from bakerydemo.base.models import FooterText, People +from bakerydemo.breads.models import BreadIngredient, BreadType, Country """ N.B. To see what icons are available for use in Wagtail menus and StreamField block types, diff --git a/bakerydemo/blog/models.py b/bakerydemo/blog/models.py index 0c2461c..ba33350 100644 --- a/bakerydemo/blog/models.py +++ b/bakerydemo/blog/models.py @@ -3,16 +3,13 @@ from __future__ import unicode_literals from django.contrib import messages from django.db import models from django.shortcuts import redirect, render - from modelcluster.contrib.taggit import ClusterTaggableManager from modelcluster.fields import ParentalKey - from taggit.models import Tag, TaggedItemBase - -from wagtail.contrib.routable_page.models import RoutablePageMixin, route from wagtail.admin.panels import FieldPanel, InlinePanel +from wagtail.contrib.routable_page.models import RoutablePageMixin, route from wagtail.fields import StreamField -from wagtail.models import Page, Orderable +from wagtail.models import Orderable, Page from wagtail.search import index from bakerydemo.base.blocks import BaseStreamBlock diff --git a/bakerydemo/breads/models.py b/bakerydemo/breads/models.py index b6c423c..110965d 100644 --- a/bakerydemo/breads/models.py +++ b/bakerydemo/breads/models.py @@ -1,9 +1,7 @@ from django import forms +from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.db import models -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger - from modelcluster.fields import ParentalManyToManyField - from wagtail.admin.panels import FieldPanel, MultiFieldPanel from wagtail.fields import StreamField from wagtail.models import Page diff --git a/bakerydemo/locations/models.py b/bakerydemo/locations/models.py index c810a16..cca7579 100644 --- a/bakerydemo/locations/models.py +++ b/bakerydemo/locations/models.py @@ -3,11 +3,9 @@ from datetime import datetime from django.conf import settings from django.core.validators import RegexValidator from django.db import models - from modelcluster.fields import ParentalKey - -from wagtail.fields import StreamField from wagtail.admin.panels import FieldPanel, InlinePanel +from wagtail.fields import StreamField from wagtail.models import Orderable, Page from wagtail.search import index diff --git a/bakerydemo/search/views.py b/bakerydemo/search/views.py index 9d0715f..b333b9f 100644 --- a/bakerydemo/search/views.py +++ b/bakerydemo/search/views.py @@ -1,7 +1,6 @@ from django.conf import settings -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.shortcuts import render - from wagtail.models import Page from wagtail.search.models import Query diff --git a/bakerydemo/urls.py b/bakerydemo/urls.py index 63ecc2a..eb1f84e 100644 --- a/bakerydemo/urls.py +++ b/bakerydemo/urls.py @@ -1,14 +1,14 @@ +import debug_toolbar from django.conf import settings from django.contrib import admin from django.urls import include, path - -import debug_toolbar -from wagtail.admin import urls as wagtailadmin_urls -from wagtail.documents import urls as wagtaildocs_urls -from wagtail.contrib.sitemaps.views import sitemap from wagtail import urls as wagtail_urls +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.contrib.sitemaps.views import sitemap +from wagtail.documents import urls as wagtaildocs_urls from bakerydemo.search import views as search_views + from .api import api_router urlpatterns = [ diff --git a/bakerydemo/wsgi.py b/bakerydemo/wsgi.py index 3bf310c..376970f 100644 --- a/bakerydemo/wsgi.py +++ b/bakerydemo/wsgi.py @@ -12,7 +12,6 @@ import os import dotenv from django.core.wsgi import get_wsgi_application - dotenv.read_dotenv(os.path.join(os.path.dirname(os.path.dirname(__file__)), ".env")) os.environ.setdefault("DJANGO_SETTINGS_MODULE", "bakerydemo.settings.dev") diff --git a/manage.py b/manage.py index 4300c44..7f26bfc 100755 --- a/manage.py +++ b/manage.py @@ -4,7 +4,6 @@ import sys import dotenv - if __name__ == "__main__": dotenv.read_dotenv()