Skip to content

Commit

Permalink
Merge pull request #67 from jkevingutierrez/feature/formatters
Browse files Browse the repository at this point in the history
Run formatters
  • Loading branch information
seb-b authored Feb 16, 2021
2 parents 100e43d + 5664376 commit 43a811e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 16 deletions.
5 changes: 3 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions wagtailvideos/blocks.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -20,4 +20,4 @@ def render_basic(self, value, context=None):
return ""

class Meta:
icon = 'media'
icon = 'media'
5 changes: 1 addition & 4 deletions wagtailvideos/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 _
Expand All @@ -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:
Expand Down Expand Up @@ -188,7 +185,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='')

Expand Down
2 changes: 1 addition & 1 deletion wagtailvideos/views/chooser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Expand Down
2 changes: 1 addition & 1 deletion wagtailvideos/views/multiple.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'):
Expand Down
2 changes: 1 addition & 1 deletion wagtailvideos/views/videos.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from wagtail.contrib.modeladmin.helpers import AdminURLHelper
from distutils.version import LooseVersion

import wagtail
Expand All @@ -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

Expand Down
9 changes: 4 additions & 5 deletions wagtailvideos/wagtail_hooks.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit 43a811e

Please sign in to comment.