Commit 062dbe4c authored by Nicholas Spagnoletti's avatar Nicholas Spagnoletti
Browse files

Change to use packaging.version to compare version numbers (because string...

Change to use packaging.version to compare version numbers (because string comparison means 2.10 > 2.7 is not True)
parent e085cb4f
......@@ -6,6 +6,7 @@ import shutil
import subprocess
import tempfile
import threading
from packaging import version
from contextlib import contextmanager
import wagtail
......@@ -29,7 +30,7 @@ from wagtail.search.queryset import SearchableQuerySetMixin
from wagtailvideos import ffmpeg
if wagtail.__version__ >= '2.7':
if version.parse(wagtail.__version__) >= version.parse('2.7'):
from wagtail.admin.models import get_object_usage
else:
from wagtail.admin.utils import get_object_usage
......
import wagtail
from packaging import version
from django.core.paginator import Paginator
from django.shortcuts import get_object_or_404, render
from django.urls import reverse
......@@ -12,7 +13,7 @@ from wagtailvideos.forms import get_video_form
from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy
if wagtail.__version__ >= '2.7':
if version.parse(wagtail.__version__) >= version.parse('2.7'):
from wagtail.admin.models import popular_tags_for_model
from wagtail.admin.auth import PermissionPolicyChecker
else:
......
import wagtail
from packaging import version
from django.http import HttpResponseBadRequest, JsonResponse
from django.shortcuts import get_object_or_404, render
from django.template.loader import render_to_string
......@@ -11,7 +12,7 @@ from wagtailvideos.forms import get_video_form
from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy
if wagtail.__version__ >= '2.7':
if version.parse(wagtail.__version__) >= version.parse('2.7'):
from wagtail.admin.auth import PermissionPolicyChecker
else:
from wagtail.admin.utils import PermissionPolicyChecker
......
import wagtail
from packaging import version
from django.core.paginator import Paginator
from django.http import HttpResponseNotAllowed
from django.shortcuts import get_object_or_404, redirect, render
......@@ -15,7 +16,7 @@ from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
from wagtailvideos.models import Video
from wagtailvideos.permissions import permission_policy
if wagtail.__version__ >= '2.7':
if version.parse(wagtail.__version__) >= version.parse('2.7'):
from wagtail.admin.models import popular_tags_for_model
from wagtail.admin.auth import PermissionPolicyChecker
else:
......
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