Fix Django 3.2 and Wagtail 2.15 compatibility

Author: Jelle

build_test/urls.py

@@ -1,7 +1,5 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
-from django.conf.urls import include, url
+from django.urls import include, re_path
 
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.core import urls as wagtail_urls
@@ -10,9 +8,9 @@
 urlpatterns = []
 
 urlpatterns += [
-    url(r'^admin/', include(wagtailadmin_urls)),
-    url(r'^documents/', include(wagtaildocs_urls)),
-    url(r'', include(wagtail_urls)),
+    re_path(r'^admin/', include(wagtailadmin_urls)),
+    re_path(r'^documents/', include(wagtaildocs_urls)),
+    re_path(r'', include(wagtail_urls)),
 ]
 
 if settings.DEBUG:

docs/getting_started/using_your_own_page_models.md

@@ -18,12 +18,12 @@ This will give you a page setup that looks something like below with your Form c
 
 
         from django.db import models
-        from django.utils.translation import ugettext_lazy as _
+        from django.utils.translation import gettext_lazy as _
 
         from wagtail.admin.edit_handlers import TabbedInterface, ObjectList, StreamFieldPanel        
+        from wagtail.core import blocks            
         from wagtail.core.fields import StreamField
         from wagtail.core.models import Page    
-        from wagtail.core import blocks            
         
         from wagtail_advanced_form_builder.models.abstract_advanced_email_form import AbstractAdvancedEmailForm
         from wagtail_advanced_form_builder.models.abstract_advanced_form_field import AbstractAdvancedFormField

provisioning/roles/server/templates/local._managed.py.j2

@@ -10,7 +10,7 @@ DATABASES = {
 {# if more than one database is defined then you must specify db.name else Django will error #}
 {% for db in item.databases %}
     '{{ db.name | default('default') }}': {
-        'ENGINE': '{{ db.engine | default('django.db.backends.postgresql_psycopg2') }}',
+        'ENGINE': '{{ db.engine | default('django.db.backends.postgresql') }}',
         'NAME': '{{ db.db_name }}',
         'USER': '{{ db.user }}',
         'PASSWORD': '{{ db.password }}',

wagtail_advanced_form_builder/constants.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 FIELD_TYPE_SINGLE_LINE = 'singleline'
 FIELD_TYPE_MULTI_LINE = 'multiline'

wagtail_advanced_form_builder/models/abstract_advanced_email_form.py

@@ -1,10 +1,12 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from wagtail.admin.edit_handlers import MultiFieldPanel, FieldRowPanel, FieldPanel
 from wagtail.contrib.forms.models import AbstractEmailForm
+
 from .abstract_advanced_form_mixin import AbstractAdvancedFormMixin
 from .email_form_field import EmailFormField
 
+
 class AbstractAdvancedEmailForm(AbstractAdvancedFormMixin, AbstractEmailForm):
 
     form_field = EmailFormField

wagtail_advanced_form_builder/models/abstract_advanced_form_field.py

@@ -1,7 +1,8 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from modelcluster.models import ClusterableModel
+
 from wagtail.contrib.forms.models import AbstractFormField
 from wagtail.core.fields import RichTextField
 

wagtail_advanced_form_builder/models/abstract_advanced_form_mixin.py

@@ -3,7 +3,7 @@
 from django.db import models
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from wagtail.admin.edit_handlers import StreamFieldPanel, FieldPanel, MultiFieldPanel
 from wagtail.core.fields import RichTextField, StreamField

wagtail_advanced_form_builder/utils.py

@@ -1,9 +1,11 @@
+# anyascii is a Wagtail dependency
+from anyascii import anyascii
+
 from django.utils.text import slugify
-from unidecode import unidecode
 
 
 def clean_form_field_name(label):
-    # unidecode will return an ascii string while slugify wants a
+    # anyascii will return an ascii string while slugify wants a
     # unicode string on the other hand, slugify returns a safe-string
     # which will be converted to a normal str
-    return str(slugify(str(unidecode(label))))
+    return str(slugify(str(anyascii(label))))