Commit 0b8f7ade authored by thorben_nehls's avatar thorben_nehls
Browse files

Sorted all imports with isort.

parent cfc0ff8b
from tests.app.settings import * # noqa: F401,F403 from tests.app.settings import * # noqa: F401,F403
DATABASES = { DATABASES = {
'default': { 'default': {
......
...@@ -6,7 +6,7 @@ Install wagtailvideos using setuptools ...@@ -6,7 +6,7 @@ Install wagtailvideos using setuptools
with open('README.rst', 'r') as f: with open('README.rst', 'r') as f:
readme = f.read() readme = f.read()
from setuptools import find_packages, setup # noqa: E4 from setuptools import find_packages, setup # noqa: E4
setup( setup(
name='wagtailvideos', name='wagtailvideos',
......
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models from django.db import models
from wagtail.core.models import Page
from wagtail.core.models import Page
from wagtailvideos.edit_handlers import VideoChooserPanel from wagtailvideos.edit_handlers import VideoChooserPanel
......
...@@ -6,6 +6,7 @@ from django.conf import settings ...@@ -6,6 +6,7 @@ from django.conf import settings
from django.conf.urls import include from django.conf.urls import include
from django.urls import path, re_path from django.urls import path, re_path
from django.views.static import serve from django.views.static import serve
from wagtail.admin import urls as wagtailadmin_urls from wagtail.admin import urls as wagtailadmin_urls
from wagtail.core import urls as wagtail_urls from wagtail.core import urls as wagtail_urls
......
...@@ -8,11 +8,11 @@ from django.core.files.uploadedfile import SimpleUploadedFile ...@@ -8,11 +8,11 @@ from django.core.files.uploadedfile import SimpleUploadedFile
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from django.urls import reverse from django.urls import reverse
from mock import patch from mock import patch
from tests.utils import create_test_video_file
from wagtail.core.models import Collection, GroupCollectionPermission from wagtail.core.models import Collection, GroupCollectionPermission
from wagtail.tests.utils import WagtailTestUtils from wagtail.tests.utils import WagtailTestUtils
from tests.utils import create_test_video_file
from wagtailvideos.models import Video from wagtailvideos.models import Video
......
from django import forms from django import forms
from django.forms.models import modelform_factory from django.forms.models import modelform_factory
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from enumchoicefield.forms import EnumField from enumchoicefield.forms import EnumField
from wagtail.admin import widgets from wagtail.admin import widgets
from wagtail.admin.forms.collections import ( from wagtail.admin.forms.collections import (
BaseCollectionMemberForm, collection_member_permission_formset_factory) BaseCollectionMemberForm, collection_member_permission_formset_factory)
from wagtailvideos.fields import WagtailVideoField from wagtailvideos.fields import WagtailVideoField
from wagtailvideos.models import MediaFormats, Video, VideoQuality from wagtailvideos.models import MediaFormats, Video, VideoQuality
from wagtailvideos.permissions import \ from wagtailvideos.permissions import \
......
...@@ -20,13 +20,13 @@ from django.urls import reverse ...@@ -20,13 +20,13 @@ from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
from django.utils.html import mark_safe from django.utils.html import mark_safe
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from enumchoicefield import ChoiceEnum, EnumChoiceField from enumchoicefield import ChoiceEnum, EnumChoiceField
from taggit.managers import TaggableManager from taggit.managers import TaggableManager
from wagtail.admin.utils import get_object_usage from wagtail.admin.utils import get_object_usage
from wagtail.core.models import CollectionMember from wagtail.core.models import CollectionMember
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 ffmpeg from wagtailvideos import ffmpeg
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
from wagtail.core.permission_policies.collections import ( from wagtail.core.permission_policies.collections import (
CollectionOwnershipPermissionPolicy) CollectionOwnershipPermissionPolicy)
from wagtailvideos.models import Video from wagtailvideos.models import Video
permission_policy = CollectionOwnershipPermissionPolicy( permission_policy = CollectionOwnershipPermissionPolicy(
......
...@@ -8,7 +8,6 @@ from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model ...@@ -8,7 +8,6 @@ from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
from wagtail.core.models import Collection 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.forms import get_video_form
from wagtailvideos.models import Video from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
...@@ -40,8 +39,8 @@ def chooser(request): ...@@ -40,8 +39,8 @@ def chooser(request):
q = None q = None
if ( if (
'q' in request.GET or 'p' in request.GET or 'tag' in request.GET 'q' in request.GET or 'p' in request.GET or 'tag' in request.GET
or 'collection_id' in request.GET or 'collection_id' in request.GET
): ):
# this request is triggered from search, pagination or 'popular tags'; # this request is triggered from search, pagination or 'popular tags';
# we will just render the results.html fragment # we will just render the results.html fragment
......
...@@ -4,9 +4,9 @@ from django.template.loader import render_to_string ...@@ -4,9 +4,9 @@ from django.template.loader import render_to_string
from django.utils.encoding import force_text from django.utils.encoding import force_text
from django.views.decorators.http import require_POST 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.utils import PermissionPolicyChecker from wagtail.admin.utils import PermissionPolicyChecker
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.forms import get_video_form
from wagtailvideos.models import Video from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
......
...@@ -10,7 +10,6 @@ from wagtail.admin.forms.search import SearchForm ...@@ -10,7 +10,6 @@ from wagtail.admin.forms.search import SearchForm
from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
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 wagtailvideos import ffmpeg from wagtailvideos import ffmpeg
from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
from wagtailvideos.models import Video from wagtailvideos.models import Video
......
...@@ -2,9 +2,9 @@ from django.conf.urls import include, url ...@@ -2,9 +2,9 @@ from django.conf.urls import include, url
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.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from wagtail.admin.menu import MenuItem from wagtail.admin.menu import MenuItem
from wagtail.core import hooks from wagtail.core import hooks
from wagtailvideos import urls from wagtailvideos import urls
from wagtailvideos.forms import GroupVideoPermissionFormSet from wagtailvideos.forms import GroupVideoPermissionFormSet
......
...@@ -2,8 +2,8 @@ import json ...@@ -2,8 +2,8 @@ import json
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from wagtail.admin.widgets import AdminChooser
from wagtail.admin.widgets import AdminChooser
from wagtailvideos.models import Video from wagtailvideos.models import Video
......
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