From 5664376714c8c0a80e6efc2e3bdc36747cb02ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Guti=C3=A9rrez?= Date: Sun, 14 Feb 2021 21:37:40 -0500 Subject: [PATCH] Run flake8 pep8, isort. Remove unused imports. --- setup.cfg | 5 +++-- wagtailvideos/blocks.py | 4 ++-- wagtailvideos/models.py | 5 +---- wagtailvideos/views/chooser.py | 2 +- wagtailvideos/views/multiple.py | 2 +- wagtailvideos/views/videos.py | 2 +- wagtailvideos/wagtail_hooks.py | 9 ++++----- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1c4c6e4..5e586ed 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,9 +10,10 @@ line_length = 79 multi_line_output = 4 [pep8] -max-line-length = 100 +max-line-length = 120 +ignore = W503 [flake8] -max-line-length = 100 +max-line-length = 120 ignore = E501 exclude = migrations diff --git a/wagtailvideos/blocks.py b/wagtailvideos/blocks.py index 1862197..09f22cc 100644 --- a/wagtailvideos/blocks.py +++ b/wagtailvideos/blocks.py @@ -1,5 +1,5 @@ -from wagtail.core.blocks import ChooserBlock from django.utils.functional import cached_property +from wagtail.core.blocks import ChooserBlock class VideoChooserBlock(ChooserBlock): @@ -20,4 +20,4 @@ def render_basic(self, value, context=None): return "" class Meta: - icon = 'media' \ No newline at end of file + icon = 'media' diff --git a/wagtailvideos/models.py b/wagtailvideos/models.py index e681ba0..ef55a49 100644 --- a/wagtailvideos/models.py +++ b/wagtailvideos/models.py @@ -15,7 +15,6 @@ from django.core.files.base import ContentFile from django.db import models from django.forms.utils import flatatt -from django.apps import apps from django.urls import reverse from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ @@ -27,8 +26,6 @@ from wagtail.search import index from wagtail.search.queryset import SearchableQuerySetMixin -from wagtailvideos import get_video_model_string - if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'): from wagtail.admin.models import get_object_usage else: @@ -183,7 +180,7 @@ def get_transcode_model(cls): @classmethod def get_track_listing_model(cls): return cls.track_listing.related.related_model - + def get_current_transcodes(self): return self.transcodes.exclude(processing=True).filter(error_message__exact='') diff --git a/wagtailvideos/views/chooser.py b/wagtailvideos/views/chooser.py index 8358030..6387ad6 100644 --- a/wagtailvideos/views/chooser.py +++ b/wagtailvideos/views/chooser.py @@ -10,8 +10,8 @@ from wagtail.images.views.chooser import get_chooser_js_data from wagtail.search import index as search_index -from wagtailvideos.forms import get_video_form from wagtailvideos import get_video_model +from wagtailvideos.forms import get_video_form from wagtailvideos.permissions import permission_policy if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'): diff --git a/wagtailvideos/views/multiple.py b/wagtailvideos/views/multiple.py index 95fbc88..4f9ca3c 100644 --- a/wagtailvideos/views/multiple.py +++ b/wagtailvideos/views/multiple.py @@ -9,8 +9,8 @@ from django.views.decorators.vary import vary_on_headers from wagtail.search.backends import get_search_backends -from wagtailvideos.forms import get_video_form from wagtailvideos import get_video_model +from wagtailvideos.forms import get_video_form from wagtailvideos.permissions import permission_policy if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'): diff --git a/wagtailvideos/views/videos.py b/wagtailvideos/views/videos.py index 03de6a8..c75491a 100644 --- a/wagtailvideos/views/videos.py +++ b/wagtailvideos/views/videos.py @@ -1,4 +1,3 @@ -from wagtail.contrib.modeladmin.helpers import AdminURLHelper from distutils.version import LooseVersion import wagtail @@ -10,6 +9,7 @@ from django.views.decorators.vary import vary_on_headers from wagtail.admin import messages from wagtail.admin.forms.search import SearchForm +from wagtail.contrib.modeladmin.helpers import AdminURLHelper from wagtail.core.models import Collection from wagtail.search.backends import get_search_backends diff --git a/wagtailvideos/wagtail_hooks.py b/wagtailvideos/wagtail_hooks.py index c597e20..c3943f0 100644 --- a/wagtailvideos/wagtail_hooks.py +++ b/wagtailvideos/wagtail_hooks.py @@ -1,20 +1,19 @@ -from wagtail.admin.edit_handlers import InlinePanel -from wagtailvideos.edit_handlers import VideoChooserPanel -from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from django.conf.urls import include, url from django.templatetags.static import static from django.urls import reverse from django.utils.html import format_html from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ +from wagtail.admin.edit_handlers import InlinePanel from wagtail.admin.menu import Menu, MenuItem, SubmenuMenuItem from wagtail.admin.search import SearchArea from wagtail.admin.site_summary import SummaryItem +from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from wagtail.core import hooks -from wagtailvideos import get_video_model, urls, is_modeladmin_installed +from wagtailvideos import get_video_model, is_modeladmin_installed, urls +from wagtailvideos.edit_handlers import VideoChooserPanel from wagtailvideos.forms import GroupVideoPermissionFormSet -from wagtailvideos.models import TrackListing from .permissions import permission_policy