Commit f1978426 authored by Liam Brenner's avatar Liam Brenner
Browse files

iSorted everything

parent 3cc2f7ce
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Generated by Django 1.9.7 on 2016-07-11 02:19 # Generated by Django 1.9.7 on 2016-07-11 02:19
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
from django.db import models from django.db import models
from wagtail.wagtailcore.models import Page from wagtail.wagtailcore.models import Page
from wagtailvideos.edit_handlers import VideoChooserPanel from wagtailvideos.edit_handlers import VideoChooserPanel
......
...@@ -2,10 +2,9 @@ from django.core.files.uploadedfile import SimpleUploadedFile ...@@ -2,10 +2,9 @@ from django.core.files.uploadedfile import SimpleUploadedFile
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
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 tests.utils import create_test_video_file
from wagtail.tests.utils import WagtailTestUtils from wagtail.tests.utils import WagtailTestUtils
from wagtail.wagtailcore.models import Collection from wagtail.wagtailcore.models import Collection
from tests.utils import create_test_video_file
from wagtailvideos.models import Video from wagtailvideos.models import Video
......
from django.template import Context, Template, TemplateSyntaxError from django.template import Context, Template, TemplateSyntaxError
from django.test import TestCase from django.test import TestCase
from tests.utils import create_test_video_file from tests.utils import create_test_video_file
from wagtailvideos.models import Video from wagtailvideos.models import Video
......
import os import os
from django.core.files import File
import tests import tests
from django.core.files import File
def create_test_video_file(): def create_test_video_file():
......
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 wagtail.wagtailadmin import widgets from wagtail.wagtailadmin import widgets
from wagtail.wagtailadmin.forms import (BaseCollectionMemberForm, from wagtail.wagtailadmin.forms import (BaseCollectionMemberForm,
collection_member_permission_formset_factory) collection_member_permission_formset_factory)
from enumchoicefield.forms import EnumField
from wagtailvideos.fields import WagtailVideoField from wagtailvideos.fields import WagtailVideoField
from wagtailvideos.models import MediaFormats, Video from wagtailvideos.models import MediaFormats, Video
from wagtailvideos.permissions import \ from wagtailvideos.permissions import \
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
# Generated by Django 1.9.1 on 2016-03-02 01:50 # Generated by Django 1.9.1 on 2016-03-02 01:50
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import taggit.managers import taggit.managers
import wagtail.wagtailadmin.taggable import wagtail.wagtailadmin.taggable
import wagtail.wagtailcore.models import wagtail.wagtailcore.models
import wagtailvideos.models import wagtailvideos.models
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Generated by Django 1.9.1 on 2016-03-21 05:10 # Generated by Django 1.9.1 on 2016-03-21 05:10
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models
import wagtailvideos.models import wagtailvideos.models
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
# Generated by Django 1.9.7 on 2016-07-05 06:46 # Generated by Django 1.9.7 on 2016-07-05 06:46
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import enumchoicefield.fields import enumchoicefield.fields
import wagtailvideos.models import wagtailvideos.models
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Generated by Django 1.9.7 on 2016-07-06 01:53 # Generated by Django 1.9.7 on 2016-07-06 01:53
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models
import wagtailvideos.models import wagtailvideos.models
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Generated by Django 1.9.7 on 2016-07-07 04:13 # Generated by Django 1.9.7 on 2016-07-07 04:13
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models
import wagtailvideos.models import wagtailvideos.models
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
from wagtail.wagtailcore.permission_policies.collections import \ from wagtail.wagtailcore.permission_policies.collections import \
CollectionOwnershipPermissionPolicy CollectionOwnershipPermissionPolicy
from wagtailvideos.models import Video from wagtailvideos.models import Video
permission_policy = CollectionOwnershipPermissionPolicy( permission_policy = CollectionOwnershipPermissionPolicy(
......
...@@ -4,7 +4,6 @@ from django import template ...@@ -4,7 +4,6 @@ from django import template
from django.forms.widgets import flatatt from django.forms.widgets import flatatt
from django.template import resolve_variable from django.template import resolve_variable
from django.utils.text import mark_safe from django.utils.text import mark_safe
from wagtailvideos.models import MediaFormats, Video from wagtailvideos.models import MediaFormats, Video
register = template.Library() register = template.Library()
......
from django.conf.urls import url from django.conf.urls import url
from wagtailvideos.views import chooser, multiple, videos from wagtailvideos.views import chooser, multiple, videos
urlpatterns = [ urlpatterns = [
......
...@@ -7,7 +7,6 @@ from wagtail.wagtailadmin.forms import SearchForm ...@@ -7,7 +7,6 @@ from wagtail.wagtailadmin.forms import SearchForm
from wagtail.wagtailadmin.modal_workflow import render_modal_workflow from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
from wagtail.wagtailcore.models import Collection from wagtail.wagtailcore.models import Collection
from wagtail.wagtailsearch.backends import get_search_backends from wagtail.wagtailsearch.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
......
...@@ -6,7 +6,6 @@ from django.views.decorators.http import require_POST ...@@ -6,7 +6,6 @@ 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.wagtailadmin.utils import PermissionPolicyChecker from wagtail.wagtailadmin.utils import PermissionPolicyChecker
from wagtail.wagtailsearch.backends import get_search_backends from wagtail.wagtailsearch.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
......
...@@ -11,7 +11,6 @@ from wagtail.wagtailadmin.forms import SearchForm ...@@ -11,7 +11,6 @@ from wagtail.wagtailadmin.forms import SearchForm
from wagtail.wagtailadmin.utils import PermissionPolicyChecker from wagtail.wagtailadmin.utils import PermissionPolicyChecker
from wagtail.wagtailcore.models import Collection, Site from wagtail.wagtailcore.models import Collection, Site
from wagtail.wagtailsearch.backends import get_search_backends from wagtail.wagtailsearch.backends import get_search_backends
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
from wagtailvideos.permissions import permission_policy from wagtailvideos.permissions import permission_policy
......
...@@ -7,7 +7,6 @@ from django.utils.html import format_html, format_html_join ...@@ -7,7 +7,6 @@ from django.utils.html import format_html, format_html_join
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailcore import hooks from wagtail.wagtailcore import hooks
from wagtailvideos.forms import GroupVideoPermissionFormSet from wagtailvideos.forms import GroupVideoPermissionFormSet
from . import urls from . import urls
......
...@@ -5,7 +5,6 @@ import json ...@@ -5,7 +5,6 @@ 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.wagtailadmin.widgets import AdminChooser from wagtail.wagtailadmin.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