Merge pull request #116 from crgwbr/fix_remove_distutils

Remove usage of distutils

wagtailvideos/ffmpeg.py

@@ -5,17 +5,13 @@ import re
 import shutil
 import subprocess
 import tempfile
+from shutil import which
 
 from django.conf import settings
 from django.core.files.base import ContentFile
 
 logger = logging.getLogger(__name__)
 
-try:
-    from shutil import which
-except ImportError:
-    from distutils.spawn import find_executable as which
-
 
 def DEVNULL():
     return open(os.devnull, 'r+b')

wagtailvideos/models.py

@@ -6,10 +6,8 @@ import shutil
 import subprocess
 import tempfile
 import threading
-from distutils.version import LooseVersion
 
 import bcp47
-import wagtail
 from django.conf import settings
 from django.core.exceptions import SuspiciousFileOperation
 from django.core.files.base import ContentFile
@@ -22,15 +20,11 @@ from enumchoicefield import ChoiceEnum, EnumChoiceField
 from modelcluster.fields import ParentalKey
 from modelcluster.models import ClusterableModel
 from taggit.managers import TaggableManager
+from wagtail.admin.models import get_object_usage
 from wagtail.models import CollectionMember, Orderable
 from wagtail.search import index
 from wagtail.search.queryset import SearchableQuerySetMixin
 
-if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'):
-    from wagtail.admin.models import get_object_usage
-else:
-    from wagtail.admin.utils import get_object_usage
-
 logger = logging.getLogger(__name__)
 
 

wagtailvideos/views/multiple.py

-from distutils.version import LooseVersion
-
-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_str
 from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
+from wagtail.admin.auth import PermissionPolicyChecker
 from wagtail.search.backends import get_search_backends
 
 from wagtailvideos import get_video_model
 from wagtailvideos.forms import get_video_form
 from wagtailvideos.permissions import permission_policy
 
-if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'):
-    from wagtail.admin.auth import PermissionPolicyChecker
-else:
-    from wagtail.admin.utils import PermissionPolicyChecker
-
 permission_checker = PermissionPolicyChecker(permission_policy)
 
 

wagtailvideos/views/videos.py

-from distutils.version import LooseVersion
-
-import wagtail
 from django.conf import settings
 from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404, redirect, render
@@ -9,7 +6,9 @@ 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
+from wagtail.admin.auth import PermissionPolicyChecker
 from wagtail.admin.forms.search import SearchForm
+from wagtail.admin.models import popular_tags_for_model
 from wagtail.contrib.modeladmin.helpers import AdminURLHelper
 from wagtail.models import Collection
 from wagtail.search.backends import get_search_backends
@@ -18,13 +17,6 @@ from wagtailvideos import ffmpeg, get_video_model, is_modeladmin_installed
 from wagtailvideos.forms import VideoTranscodeAdminForm, get_video_form
 from wagtailvideos.permissions import permission_policy
 
-if LooseVersion(wagtail.__version__) >= LooseVersion('2.7'):
-    from wagtail.admin.auth import PermissionPolicyChecker
-    from wagtail.admin.models import popular_tags_for_model
-else:
-    from wagtail.admin.utils import (
-        PermissionPolicyChecker, popular_tags_for_model)
-
 permission_checker = PermissionPolicyChecker(permission_policy)