Merge pull request #191 from FlipperPA/upgrade/django-4-and-wagtail-2.16

leongraumans · web-flow · commit fa74e84dac89 · 2022-05-11T15:55:15.000+02:00
Django 4.0 and Wagtail 2.16 Upgrade
diff --git a/example/urls.py b/example/urls.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.conf.urls.static import static
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.contrib import admin
 
 from wagtail.admin import urls as wagtailadmin_urls
@@ -9,14 +9,14 @@
 
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^cms/', include(wagtailadmin_urls)),
-    url(r'^documents/', include(wagtaildocs_urls)),
+    re_path(r'^admin/', admin.site.urls),
+    re_path(r'^cms/', include(wagtailadmin_urls)),
+    re_path(r'^documents/', include(wagtaildocs_urls)),
 ]
 
 if settings.DEBUG:  # pragma: no cover
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 urlpatterns += [
-    url(r'', include(wagtail_urls)),
+    re_path(r'', include(wagtail_urls)),
 ]
diff --git a/setup.py b/setup.py
@@ -60,12 +60,14 @@
         "Framework :: Wagtail",
         "Framework :: Wagtail :: 2",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Framework :: Django",
-        "Framework :: Django :: 2.0",
-        "Framework :: Django :: 3.0",
+        "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4",
         "Framework :: Wagtail",
         "Framework :: Wagtail :: 2",
         "Topic :: Internet :: WWW/HTTP :: Site Management",
diff --git a/tests/blocks/test_form_block.py b/tests/blocks/test_form_block.py
diff --git a/tests/models/test_form.py b/tests/models/test_form.py
@@ -1,7 +1,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.test import override_settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.core.models import Page
 
 from wagtailstreamforms.conf import get_setting
diff --git a/tests/settings.py b/tests/settings.py
@@ -43,24 +43,14 @@
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
 ]
 
-WAGTAIL_VERSION = re.search("wt[0-9]*", os.environ.get("TOX_ENV_NAME", "wt211"))[0]
+DJANGO_VERSION = int(
+    re.search("dj([0-9]+)", os.environ.get("TOX_ENV_NAME", "dj40")).group(1)
+)
+WAGTAIL_VERSION = int(
+    re.search("wt([0-9]+)", os.environ.get("TOX_ENV_NAME", "wt216")).group(1)
+)
 
-PRE_WAGTAIL_211_VERSIONS = [
-    "wt23",
-    "wt24",
-    "wt25",
-    "wt26",
-    "wt27",
-    "wt28",
-    "wt29",
-    "wt210",
-]
-
-PRE_WAGTAIL_211 = False
-
-if WAGTAIL_VERSION in PRE_WAGTAIL_211_VERSIONS:
-    MIDDLEWARE.append("wagtail.core.middleware.SiteMiddleware")
-    PRE_WAGTAIL_211 = True
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": "testdb"}}
 
diff --git a/tests/templatetags/test_form.py b/tests/templatetags/test_form.py
diff --git a/tests/urls.py b/tests/urls.py
@@ -1,10 +1,10 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.contrib import admin
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.core import urls as wagtail_urls
 
 urlpatterns = [
-    url(r"^admin/", admin.site.urls),
-    url(r"^cms/", include(wagtailadmin_urls)),
-    url(r"", include(wagtail_urls)),
+    re_path(r"^admin/", admin.site.urls),
+    re_path(r"^cms/", include(wagtailadmin_urls)),
+    re_path(r"", include(wagtail_urls)),
 ]
diff --git a/tests/views/test_copy.py b/tests/views/test_copy.py
@@ -80,11 +80,8 @@ def test_user_with_no_perm_no_access(self):
         self.client.login(username="user", password="password")
 
         response = self.client.get(self.copy_url)
-        if settings.PRE_WAGTAIL_211:
-            self.assertEqual(response.status_code, 403)
-        else:
-            self.assertEqual(response.status_code, 302)
-            self.assertTrue(response.url.startswith("/cms/"))
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.url.startswith("/cms/"))
 
     def test_user_with_add_perm_has_access(self):
         access_admin = Permission.objects.get(codename="access_admin")
diff --git a/tests/views/test_delete.py b/tests/views/test_delete.py
@@ -1,4 +1,3 @@
-from django.conf import settings
 from django.contrib.auth.models import Permission, User
 from django.urls import reverse
 
@@ -34,7 +33,7 @@ def setUp(self):
 
         self.client.login(username="user", password="password")
 
-    def test_get_responds(self):
+    def test_get_response(self):
         response = self.client.get(self.multiple_url)
         self.assertEqual(response.status_code, 200)
 
@@ -102,11 +101,8 @@ def test_user_with_no_perm_no_access(self):
         self.client.login(username="user", password="password")
 
         response = self.client.get(self.delete_url)
-        if settings.PRE_WAGTAIL_211:
-            self.assertEqual(response.status_code, 403)
-        else:
-            self.assertEqual(response.status_code, 302)
-            self.assertTrue(response.url.startswith("/cms/"))
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.url.startswith("/cms/"))
 
     def test_user_with_delete_perm_has_access(self):
         access_admin = Permission.objects.get(codename="access_admin")
diff --git a/tests/views/test_submission_list.py b/tests/views/test_submission_list.py
@@ -96,11 +96,8 @@ def test_user_with_no_perm_no_access(self):
         self.client.login(username="user", password="password")
 
         response = self.client.get(self.list_url)
-        if settings.PRE_WAGTAIL_211:
-            self.assertEqual(response.status_code, 403)
-        else:
-            self.assertEqual(response.status_code, 302)
-            self.assertTrue(response.url.startswith("/cms/"))
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(response.url.startswith("/cms/"))
 
     def test_user_with_add_perm_has_access(self):
         access_admin = Permission.objects.get(codename="access_admin")
diff --git a/wagtailstreamforms/blocks.py b/wagtailstreamforms/blocks.py
@@ -2,7 +2,7 @@
 
 from django import forms
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.core import blocks
 
 from wagtailstreamforms.models import Form
diff --git a/wagtailstreamforms/conf.py b/wagtailstreamforms/conf.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 SETTINGS_PREFIX = "WAGTAILSTREAMFORMS"
 SETTINGS_DEFAULTS = {
diff --git a/wagtailstreamforms/forms.py b/wagtailstreamforms/forms.py
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from wagtailstreamforms.fields import get_fields
 from wagtailstreamforms.utils.general import get_slug_from_string
diff --git a/wagtailstreamforms/models/file.py b/wagtailstreamforms/models/file.py
@@ -1,6 +1,6 @@
 from django.db import models, transaction
 from django.db.models.signals import post_delete
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FormSubmissionFile(models.Model):
diff --git a/wagtailstreamforms/models/form.py b/wagtailstreamforms/models/form.py
@@ -1,7 +1,7 @@
 import uuid
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail import VERSION as WAGTAIL_VERSION
 from wagtail.admin.edit_handlers import (
     FieldPanel,
diff --git a/wagtailstreamforms/models/submission.py b/wagtailstreamforms/models/submission.py
@@ -1,7 +1,7 @@
 import json
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class FormSubmission(models.Model):
diff --git a/wagtailstreamforms/views/advanced_settings.py b/wagtailstreamforms/views/advanced_settings.py
@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib import messages
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import UpdateView
 
 from wagtailstreamforms.models import Form
diff --git a/wagtailstreamforms/views/copy.py b/wagtailstreamforms/views/copy.py
@@ -2,7 +2,7 @@
 from django.contrib import messages
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic.detail import (
     BaseDetailView,
     SingleObjectTemplateResponseMixin,
diff --git a/wagtailstreamforms/views/submission_delete.py b/wagtailstreamforms/views/submission_delete.py
@@ -2,7 +2,7 @@
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseRedirect
 from django.urls import reverse
-from django.utils.translation import ungettext
+from django.utils.translation import ngettext
 from django.views.generic import DeleteView
 from wagtail.contrib.modeladmin.helpers import PermissionHelper
 
@@ -40,6 +40,19 @@ def get_context_data(self, **kwargs):
         return context
 
     def delete(self, request, *args, **kwargs):
+        """
+        Django 4.0 uses FormMixin, so this logic has been moved to form_valid.
+
+        This can be removed once Django 3.2 is no longer supported.
+        """
+        success_url = self.get_success_url()
+        submissions = self.get_submissions()
+        count = submissions.count()
+        submissions.delete()
+        self.create_success_message(count)
+        return HttpResponseRedirect(success_url)
+
+    def form_valid(self, request, *args, **kwargs):
         success_url = self.get_success_url()
         submissions = self.get_submissions()
         count = submissions.count()
@@ -50,7 +63,7 @@ def delete(self, request, *args, **kwargs):
     def create_success_message(self, count):
         messages.success(
             self.request,
-            ungettext(
+            ngettext(
                 "One submission has been deleted.",
                 "%(count)d submissions have been deleted.",
                 count,
diff --git a/wagtailstreamforms/views/submission_list.py b/wagtailstreamforms/views/submission_list.py
@@ -4,7 +4,7 @@
 from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponse
 from django.utils.encoding import smart_str
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic import ListView
 from django.views.generic.detail import SingleObjectMixin
 from wagtail.contrib.modeladmin.helpers import PermissionHelper
diff --git a/wagtailstreamforms/wagtail_hooks.py b/wagtailstreamforms/wagtail_hooks.py
@@ -1,12 +1,12 @@
-from django.conf.urls import include
+from django.urls import include
 from django.contrib import messages
 from django.contrib.admin.utils import quote
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.urls import path, reverse
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin import messages as wagtail_messages
 from wagtail.contrib.modeladmin.helpers import AdminURLHelper, ButtonHelper
 from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
diff --git a/wagtailstreamforms/wagtailstreamforms_fields.py b/wagtailstreamforms/wagtailstreamforms_fields.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.core import blocks
 
 from wagtailstreamforms.conf import get_setting
