Unverified Commit 43a811e8 authored by seb-b's avatar seb-b Committed by GitHub
Browse files

Merge pull request #67 from jkevingutierrez/feature/formatters

Run formatters
parents 100e43d1 56643767
...@@ -10,9 +10,10 @@ line_length = 79 ...@@ -10,9 +10,10 @@ line_length = 79
multi_line_output = 4 multi_line_output = 4
[pep8] [pep8]
max-line-length = 100 max-line-length = 120
ignore = W503
[flake8] [flake8]
max-line-length = 100 max-line-length = 120
ignore = E501 ignore = E501
exclude = migrations exclude = migrations
from wagtail.core.blocks import ChooserBlock
from django.utils.functional import cached_property from django.utils.functional import cached_property
from wagtail.core.blocks import ChooserBlock
class VideoChooserBlock(ChooserBlock): class VideoChooserBlock(ChooserBlock):
...@@ -20,4 +20,4 @@ class VideoChooserBlock(ChooserBlock): ...@@ -20,4 +20,4 @@ class VideoChooserBlock(ChooserBlock):
return "" return ""
class Meta: class Meta:
icon = 'media' icon = 'media'
\ No newline at end of file
...@@ -15,7 +15,6 @@ from django.core.exceptions import SuspiciousFileOperation ...@@ -15,7 +15,6 @@ from django.core.exceptions import SuspiciousFileOperation
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.db import models from django.db import models
from django.forms.utils import flatatt from django.forms.utils import flatatt
from django.apps import apps
from django.urls import reverse from django.urls import reverse
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
...@@ -27,8 +26,6 @@ from wagtail.core.models import CollectionMember, Orderable ...@@ -27,8 +26,6 @@ from wagtail.core.models import CollectionMember, Orderable
from wagtail.search import index from wagtail.search import index
from wagtail.search.queryset import SearchableQuerySetMixin from wagtail.search.queryset import SearchableQuerySetMixin
from wagtailvideos import get_video_model_string
if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'): if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'):
from wagtail.admin.models import get_object_usage from wagtail.admin.models import get_object_usage
else: else:
...@@ -188,7 +185,7 @@ class AbstractVideo(CollectionMember, index.Indexed, models.Model): ...@@ -188,7 +185,7 @@ class AbstractVideo(CollectionMember, index.Indexed, models.Model):
@classmethod @classmethod
def get_track_listing_model(cls): def get_track_listing_model(cls):
return cls.track_listing.related.related_model return cls.track_listing.related.related_model
def get_current_transcodes(self): def get_current_transcodes(self):
return self.transcodes.exclude(processing=True).filter(error_message__exact='') return self.transcodes.exclude(processing=True).filter(error_message__exact='')
......
...@@ -10,8 +10,8 @@ from wagtail.core.models import Collection ...@@ -10,8 +10,8 @@ from wagtail.core.models import Collection
from wagtail.images.views.chooser import get_chooser_js_data from wagtail.images.views.chooser import get_chooser_js_data
from wagtail.search import index as search_index from wagtail.search import index as search_index
from wagtailvideos.forms import get_video_form
from wagtailvideos import get_video_model from wagtailvideos import get_video_model
from wagtailvideos.forms import get_video_form
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'): if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'):
......
...@@ -9,8 +9,8 @@ from django.views.decorators.http import require_POST ...@@ -9,8 +9,8 @@ from django.views.decorators.http import require_POST
from django.views.decorators.vary import vary_on_headers from django.views.decorators.vary import vary_on_headers
from wagtail.search.backends import get_search_backends from wagtail.search.backends import get_search_backends
from wagtailvideos.forms import get_video_form
from wagtailvideos import get_video_model from wagtailvideos import get_video_model
from wagtailvideos.forms import get_video_form
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'): if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'):
......
from wagtail.contrib.modeladmin.helpers import AdminURLHelper
from distutils.version import LooseVersion from distutils.version import LooseVersion
import wagtail import wagtail
...@@ -10,6 +9,7 @@ from django.views.decorators.http import require_POST ...@@ -10,6 +9,7 @@ from django.views.decorators.http import require_POST
from django.views.decorators.vary import vary_on_headers from django.views.decorators.vary import vary_on_headers
from wagtail.admin import messages from wagtail.admin import messages
from wagtail.admin.forms.search import SearchForm from wagtail.admin.forms.search import SearchForm
from wagtail.contrib.modeladmin.helpers import AdminURLHelper
from wagtail.core.models import Collection from wagtail.core.models import Collection
from wagtail.search.backends import get_search_backends from wagtail.search.backends import get_search_backends
......
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.conf.urls import include, url
from django.templatetags.static import static from django.templatetags.static import static
from django.urls import reverse from django.urls import reverse
from django.utils.html import format_html from django.utils.html import format_html
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _ 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.menu import Menu, MenuItem, SubmenuMenuItem
from wagtail.admin.search import SearchArea from wagtail.admin.search import SearchArea
from wagtail.admin.site_summary import SummaryItem from wagtail.admin.site_summary import SummaryItem
from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
from wagtail.core import hooks 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.forms import GroupVideoPermissionFormSet
from wagtailvideos.models import TrackListing
from .permissions import permission_policy from .permissions import permission_policy
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment