Merge branch 'master' into django-rq

Author: mmena1

.gitignore

@@ -2,3 +2,5 @@
 *.egg-info
 dist/
 venv/
+build/
+.vscode/

README.rst

@@ -1,6 +1,6 @@
-===============
+===================
 wagtail-linkchecker
-===============
+===================
 
 A tool/plugin to assist with finding broken links on your wagtail site.
 This tool works asynchronously using django-rq.

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='wagtail-linkchecker',
-    version='0.4.1',
+    version='0.5.3',
     description="A tool to assist with finding broken links on your wagtail site.",
     long_description=readme,
     author='Samuel Mendes',

wagtaillinkchecker/management/commands/linkcheck.py

@@ -4,12 +4,11 @@
 from django.core.management.base import BaseCommand
 from django.template.loader import render_to_string
 
-from wagtail import __version__ as WAGTAIL_VERSION
-
 from wagtaillinkchecker.scanner import broken_link_scan
 from wagtaillinkchecker.models import ScanLink
+from wagtaillinkchecker import utils
 
-if WAGTAIL_VERSION >= '2.0':
+if utils.is_wagtail_version_more_than_equal_to_2_0():
     from wagtail.core.models import PageRevision, Site
 else:
     from wagtail.wagtailcore.models import PageRevision, Site

wagtaillinkchecker/models.py

@@ -7,9 +7,10 @@
 from django.dispatch import receiver
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
-from wagtail import __version__ as WAGTAIL_VERSION
 
-if WAGTAIL_VERSION >= '2.0':
+from wagtaillinkchecker import utils
+
+if utils.is_wagtail_version_more_than_equal_to_2_0():
     from wagtail.core.models import Site
     from wagtail.core.models import Page
 else:

wagtaillinkchecker/utils.py

@@ -0,0 +1,15 @@
+import re
+from wagtail import __version__ as WAGTAIL_VERSION
+
+
+def is_wagtail_version_more_than_equal_to_2_5():
+	expression = '^((2.([5-9]{1,}|([1-9]{1,}[0-9]{1,}))(.\d+)*)|(([3-9]{1,})(.\d+)*))$'
+
+	return re.search(expression, WAGTAIL_VERSION)
+
+
+def is_wagtail_version_more_than_equal_to_2_0():
+	expression = '^((2.([0-9]{1,}|([1-9]{1,}[0-9]{1,}))(.\d+)*)|(([3-9]{1,})(.\d+)*))$'
+
+	return re.search(expression, WAGTAIL_VERSION)
+

wagtaillinkchecker/views.py

@@ -4,15 +4,21 @@
 
 from django.shortcuts import get_object_or_404
 from django.shortcuts import redirect, render
+
+try:
+    from django.utils.lru_cache import lru_cache
+except ModuleNotFoundError:
+    from functools import lru_cache
+
 from django.utils.translation import ugettext_lazy as _
-from wagtail import __version__ as WAGTAIL_VERSION
 
 from wagtaillinkchecker.forms import SitePreferencesForm
 from wagtaillinkchecker.models import SitePreferences, Scan
 from wagtaillinkchecker.pagination import paginate
 from wagtaillinkchecker.scanner import broken_link_scan
+from wagtaillinkchecker import utils
 
-if WAGTAIL_VERSION >= '2.0':
+if utils.is_wagtail_version_more_than_equal_to_2_0():
     from wagtail.admin import messages
     from wagtail.admin.edit_handlers import (ObjectList,
                                              extract_panel_definitions_from_model_class)
@@ -27,7 +33,11 @@
 @lru_cache()
 def get_edit_handler(model):
     panels = extract_panel_definitions_from_model_class(model, ['site'])
-    return ObjectList(panels).bind_to_model(model)
+
+    if utils.is_wagtail_version_more_than_equal_to_2_5():
+        return ObjectList(panels).bind_to(model=model)
+    else:
+        return ObjectList(panels).bind_to_model(model)
 
 
 def scan(request, scan_pk):
@@ -83,7 +93,12 @@ def settings(request):
             messages.error(request, _('The form could not be saved due to validation errors'))
     else:
         form = SitePreferencesForm(instance=instance)
-        edit_handler = object_list.bind_to_instance(instance=SitePreferences, form=form, request=request)
+        if utils.is_wagtail_version_more_than_equal_to_2_5():
+            edit_handler = object_list.bind_to(
+                instance=SitePreferences, form=form, request=request)
+        else:
+            edit_handler = object_list.bind_to_instance(
+                instance=SitePreferences, form=form, request=request)
 
     return render(request, 'wagtaillinkchecker/settings.html', {
         'form': form,

wagtaillinkchecker/wagtail_hooks.py

@@ -3,16 +3,16 @@
 from django import __version__ as DJANGO_VERSION
 from django.conf.urls import include, url
 from django.utils.translation import ugettext_lazy as _
-from wagtail import __version__ as WAGTAIL_VERSION
 
 from wagtaillinkchecker import urls
+from wagtaillinkchecker import utils
 
-if DJANGO_VERSION >= '2.0':
+if utils.is_wagtail_version_more_than_equal_to_2_0():
     from django import urls as urlresolvers
 else:
     from django.core import urlresolvers
 
-if WAGTAIL_VERSION >= '2.0':
+if utils.is_wagtail_version_more_than_equal_to_2_0():
     from wagtail.admin.menu import MenuItem
     from wagtail.core import hooks
 else: