Merge pull request #87 from jkevingutierrez/feature/django-4.0

Start preparing things for Django4.0

setup.py

@@ -19,7 +19,7 @@ setup(
 
     install_requires=[
         'wagtail>=2.5',
-        'Django>=1.11',
+        'Django>=2.0',
         'django-enumchoicefield>=1.1.0',
         'bcp47==0.0.4',
     ],

tests/storage.py

@@ -10,7 +10,7 @@ from django.core.files.storage import FileSystemStorage
 from django.utils import timezone
 from django.utils._os import safe_join
 from django.utils.deconstruct import deconstructible
-from django.utils.encoding import filepath_to_uri, force_text
+from django.utils.encoding import filepath_to_uri, force_str
 
 
 @deconstructible
@@ -101,7 +101,7 @@ class RemoteStorage(FileSystemStorage):
             os.chmod(full_path, self.file_permissions_mode)
 
         # Store filenames with forward slashes, even on Windows.
-        return force_text(name.replace('\\', '/'))
+        return force_str(name.replace('\\', '/'))
 
     def delete(self, name):
         assert name, "The name argument is not allowed to be empty."

wagtailvideos/fields.py

@@ -2,7 +2,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.forms.fields import FileField
 from django.template.defaultfilters import filesizeformat
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class WagtailVideoField(FileField):

wagtailvideos/forms.py

 from django import forms
 from django.forms.models import modelform_factory
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from enumchoicefield.forms import EnumField
 from wagtail.admin import widgets
 from wagtail.admin.forms.collections import (

wagtailvideos/models.py

@@ -17,7 +17,7 @@ from django.db import models
 from django.forms.utils import flatatt
 from django.urls import reverse
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from enumchoicefield import ChoiceEnum, EnumChoiceField
 from modelcluster.fields import ParentalKey
 from modelcluster.models import ClusterableModel

wagtailvideos/urls.py

-from django.conf.urls import url
+from django.urls import path, re_path
 
 from wagtailvideos.views import chooser, multiple, videos
 
 app_name = 'wagtailvideos'
 urlpatterns = [
-    url(r'^$', videos.index, name='index'),
-    url(r'^(\d+)/$', videos.edit, name='edit'),
-    url(r'^(\d+)/delete/$', videos.delete, name='delete'),
-    url(r'^(\d+)/create_transcode/$', videos.create_transcode, name='create_transcode'),
+    path('add/', videos.add, name='add'),
+    re_path(r'^usage/(\d+)/$', videos.usage, name='video_usage'),
 
-    url(r'^add/$', videos.add, name='add'),
-    url(r'^usage/(\d+)/$', videos.usage, name='video_usage'),
+    path('multiple/add/', multiple.add, name='add_multiple'),
+    re_path(r'^multiple/(\d+)/delete/$', multiple.delete, name='delete_multiple'),
+    re_path(r'^multiple/(\d+)/$', multiple.edit, name='edit_multiple'),
 
-    url(r'^multiple/add/$', multiple.add, name='add_multiple'),
-    url(r'^multiple/(\d+)/$', multiple.edit, name='edit_multiple'),
-    url(r'^multiple/(\d+)/delete/$', multiple.delete, name='delete_multiple'),
+    path('chooser/upload/', chooser.chooser_upload, name='chooser_upload'),
+    re_path(r'^chooser/(\d+)/$', chooser.video_chosen, name='video_chosen'),
+    path('chooser/', chooser.chooser, name='chooser'),
 
-    url(r'^chooser/$', chooser.chooser, name='chooser'),
-    url(r'^chooser/(\d+)/$', chooser.video_chosen, name='video_chosen'),
-    url(r'^chooser/upload/$', chooser.chooser_upload, name='chooser_upload'),
+    re_path(r'^(\d+)/delete/$', videos.delete, name='delete'),
+    re_path(r'^(\d+)/create_transcode/$', videos.create_transcode, name='create_transcode'),
+    re_path(r'^(\d+)/$', videos.edit, name='edit'),
+    path('', videos.index, name='index'),
 ]

wagtailvideos/views/multiple.py

@@ -4,7 +4,7 @@ import wagtail
 from django.http import HttpResponseBadRequest, JsonResponse
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
 from wagtail.search.backends import get_search_backends
@@ -48,7 +48,7 @@ def add(request):
         collections_to_choose = None
 
     if request.method == 'POST':
-        if not request.is_ajax():
+        if request.headers.get('x-requested-with') != 'XMLHttpRequest':
             return HttpResponseBadRequest("Cannot POST to this view without AJAX")
 
         if not request.FILES:
@@ -83,7 +83,7 @@ def add(request):
                 'success': False,
 
                 # https://github.com/django/django/blob/stable/1.6.x/django/forms/util.py#L45
-                'error_message': '\n'.join(['\n'.join([force_text(i) for i in v]) for k, v in form.errors.items()]),
+                'error_message': '\n'.join(['\n'.join([force_str(i) for i in v]) for k, v in form.errors.items()]),
             })
     else:
         form = VideoForm()
@@ -104,7 +104,7 @@ def edit(request, video_id, callback=None):
 
     video = get_object_or_404(Video, id=video_id)
 
-    if not request.is_ajax():
+    if request.headers.get('x-requested-with') != 'XMLHttpRequest':
         return HttpResponseBadRequest("Cannot POST to this view without AJAX")
 
     form = VideoForm(
@@ -137,7 +137,7 @@ def edit(request, video_id, callback=None):
 def delete(request, video_id):
     video = get_object_or_404(get_video_model(), id=video_id)
 
-    if not request.is_ajax():
+    if request.headers.get('x-requested-with') != 'XMLHttpRequest':
         return HttpResponseBadRequest("Cannot POST to this view without AJAX")
 
     video.delete()

wagtailvideos/views/videos.py

@@ -5,7 +5,7 @@ from django.conf import settings
 from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
 from wagtail.admin import messages
@@ -60,7 +60,7 @@ def index(request):
     page = paginator.get_page(request.GET.get('p'))
 
     # Create response
-    if request.is_ajax():
+    if request.headers.get('x-requested-with') == 'XMLHttpRequest':
         response = render(request, 'wagtailvideos/videos/results.html', {
             'videos': page,
             'query_string': query_string,

wagtailvideos/wagtail_hooks.py

-from django.conf.urls import include, url
+from django.conf.urls import include
 from django.templatetags.static import static
-from django.urls import reverse
+from django.urls import path, reverse
 from django.utils.html import format_html
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.edit_handlers import InlinePanel
 from wagtail.admin.menu import Menu, MenuItem, SubmenuMenuItem
 from wagtail.admin.search import SearchArea
@@ -43,7 +43,7 @@ if is_modeladmin_installed():
 @hooks.register('register_admin_urls')
 def register_admin_urls():
     return [
-        url(r'^videos/', include(urls)),
+        path('videos/', include(urls)),
     ]
 
 

wagtailvideos/widgets.py

 import json
 
 from django.template.loader import render_to_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.widgets import AdminChooser
 
 from wagtailvideos import get_video_model