Made plugin python 2 compatible

wagtailvideos/models.py

-from __future__ import unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import os.path
@@ -17,7 +17,6 @@ from django.db.models.signals import post_save, pre_delete
 from django.dispatch.dispatcher import receiver
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
-from enumchoicefield import ChoiceEnum, EnumChoiceField
 from taggit.managers import TaggableManager
 from unidecode import unidecode
 from wagtail.wagtailadmin.taggable import TagSearchable
@@ -26,6 +25,8 @@ from wagtail.wagtailcore.models import CollectionMember
 from wagtail.wagtailsearch import index
 from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin
 
+from enumchoicefield import ChoiceEnum, EnumChoiceField
+
 
 class MediaFormats(ChoiceEnum):
     webm = 'VP8 and Vorbis in WebM'
@@ -86,9 +87,6 @@ class AbstractVideo(CollectionMember, TagSearchable):
     def get_upload_to(self, filename):
         folder_name = 'original_videos'
         filename = self.file.field.storage.get_valid_name(filename)
-        # do a unidecode in the filename and then
-        # replace non-ascii characters in filename with _ , to sidestep issues with filesystem encoding
-        filename = "".join((i if ord(i) < 128 else '_') for i in unidecode(filename))
 
         # Truncate filename so it fits in the 100 character limit
         # https://code.djangoproject.com/ticket/9893

wagtailvideos/permissions.py

+from __future__ import absolute_import, print_function, unicode_literals
+
 from wagtail.wagtailcore.permission_policies.collections import \
     CollectionOwnershipPermissionPolicy
+
 from wagtailvideos.models import Video
 
 permission_policy = CollectionOwnershipPermissionPolicy(

wagtailvideos/templatetags/wagtailvideos_tags.py

-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django import template
 from django.forms.widgets import flatatt
 from django.template import resolve_variable
 from django.utils.text import mark_safe
+
 from wagtailvideos.models import MediaFormats, Video
 
 register = template.Library()

wagtailvideos/urls.py

+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf.urls import url
+
 from wagtailvideos.views import chooser, multiple, videos
 
 urlpatterns = [

wagtailvideos/utils.py

+from __future__ import absolute_import, print_function, unicode_literals
+
 try:
     from shutil import which
 except ImportError:

wagtailvideos/views/chooser.py

+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
 
 from django.core.urlresolvers import reverse

wagtailvideos/views/multiple.py

+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.http import HttpResponseBadRequest, JsonResponse
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
@@ -6,6 +8,7 @@ from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
 from wagtail.wagtailadmin.utils import PermissionPolicyChecker
 from wagtail.wagtailsearch.backends import get_search_backends
+
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy

wagtailvideos/views/videos.py

+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 
 from django.core.urlresolvers import NoReverseMatch, reverse
@@ -11,6 +13,7 @@ from wagtail.wagtailadmin.forms import SearchForm
 from wagtail.wagtailadmin.utils import PermissionPolicyChecker
 from wagtail.wagtailcore.models import Collection, Site
 from wagtail.wagtailsearch.backends import get_search_backends
+
 from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
 from wagtailvideos.models import Video
 from wagtailvideos.permissions import permission_policy
@@ -125,7 +128,7 @@ def create_transcode(request, video_id):
         return HttpResponseNotAllowed(['POST'])
 
     video = get_object_or_404(Video, id=video_id)
-    transcode_form = VideoTranscodeAdminForm(request.POST, video=video)
+    transcode_form = VideoTranscodeAdminForm(data=request.POST, video=video)
 
     if transcode_form.is_valid():
         transcode_form.save()

wagtailvideos/wagtail_hooks.py

-from __future__ import unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.conf.urls import include, url
 from django.contrib.staticfiles.templatetags.staticfiles import static
@@ -7,6 +7,7 @@ from django.utils.html import format_html, format_html_join
 from django.utils.translation import ugettext_lazy as _
 from wagtail.wagtailadmin.menu import MenuItem
 from wagtail.wagtailcore import hooks
+
 from wagtailvideos.forms import GroupVideoPermissionFormSet
 
 from . import urls

wagtailvideos/widgets.py

-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 import json
 
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 from wagtail.wagtailadmin.widgets import AdminChooser
+
 from wagtailvideos.models import Video