Merge pull request #37 from Calinator1/master

Fix deprecated warning for "paginate/Paginator", flake8 amendments.

.flake8

 [flake8]
 ignore = E731,W503
 max-line-length = 120
-exclude = migrations
+exclude = migrations,.tox

runtests.py

@@ -15,5 +15,6 @@ def run():
         shutil.rmtree(STATIC_ROOT, ignore_errors=True)
         shutil.rmtree(MEDIA_ROOT, ignore_errors=True)
 
+
 if __name__ == '__main__':
     run()

settings.py

-from tests.app.settings import *
+from tests.app.settings import *  # noqa: F401,F403
 
 DATABASES = {
     'default': {

setup.py

@@ -6,7 +6,7 @@ Install wagtailvideos using setuptools
 with open('README.rst', 'r') as f:
     readme = f.read()
 
-from setuptools import find_packages, setup
+from setuptools import find_packages, setup  # noqa: E4
 
 setup(
     name='wagtailvideos',

wagtailvideos/views/chooser.py

+from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from wagtail.admin.forms.search import SearchForm
@@ -6,7 +7,6 @@ from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
 from wagtail.core.models import Collection
 from wagtail.images.views.chooser import get_chooser_js_data
 from wagtail.search import index as search_index
-from wagtail.utils.pagination import paginate
 
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.models import Video
@@ -62,10 +62,11 @@ def chooser(request):
                 videos = videos.filter(tags__name=tag_name)
 
         # Pagination
-        paginator, videos = paginate(request, videos, per_page=12)
+        paginator = Paginator(videos, per_page=12)
+        page = paginator.get_page(request.GET.get('p'))
 
         return render(request, "wagtailvideos/chooser/results.html", {
-            'videos': videos,
+            'videos': page,
             'is_searching': is_searching,
             'query_string': q,
         })
@@ -76,10 +77,11 @@ def chooser(request):
         if len(collections) < 2:
             collections = None
 
-        paginator, videos = paginate(request, videos, per_page=12)
+        paginator = Paginator(videos, per_page=12)
+        page = paginator.get_page(request.GET.get('p'))
 
     return render_modal_workflow(request, 'wagtailvideos/chooser/chooser.html', None, {
-        'videos': videos,
+        'videos': page,
         'uploadform': uploadform,
         'searchform': searchform,
         'is_searching': False,
@@ -126,10 +128,11 @@ def chooser_upload(request):
         form = VideoForm()
 
     videos = Video.objects.order_by('title')
-    paginator, videos = paginate(request, videos, per_page=12)
+    paginator = Paginator(videos, per_page=12)
+    page = paginator.get_page(request.GET.get('p'))
 
     return render_modal_workflow(
         request, 'wagtailvideos/chooser/chooser.html', None,
-        template_vars={'videos': videos, 'uploadform': form, 'searchform': searchform},
+        template_vars={'videos': page, 'uploadform': form, 'searchform': searchform},
         json_data=get_chooser_js_data()
     )

wagtailvideos/views/videos.py

+from django.core.paginator import Paginator
 from django.http import HttpResponseNotAllowed
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -8,7 +9,6 @@ from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
 from wagtail.core.models import Collection
 from wagtail.search.backends import get_search_backends
-from wagtail.utils.pagination import paginate
 
 from wagtailvideos import ffmpeg
 from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
@@ -45,19 +45,20 @@ def index(request):
         except (ValueError, Collection.DoesNotExist):
             pass
 
-    paginator, videos = paginate(request, videos)
+    paginator = Paginator(videos, per_page=25)
+    page = paginator.get_page(request.GET.get('p'))
 
     # Create response
     if request.is_ajax():
         response = render(request, 'wagtailvideos/videos/results.html', {
-            'vidoes': videos,
+            'videos': page,
             'query_string': query_string,
             'is_searching': bool(query_string),
         })
         return response
     else:
         response = render(request, 'wagtailvideos/videos/index.html', {
-            'videos': videos,
+            'videos': page,
             'query_string': query_string,
             'is_searching': bool(query_string),
 
@@ -180,9 +181,10 @@ def add(request):
 def usage(request, image_id):
     image = get_object_or_404(Video, id=image_id)
 
-    paginator, used_by = paginate(request, image.get_usage())
+    paginator = Paginator(image.get_usage(), per_page=12)
+    page = paginator.get_page(request.GET.get('p'))
 
     return render(request, "wagtailvideos/videos/usage.html", {
         'image': image,
-        'used_by': used_by
+        'used_by': page
     })