Merge pull request #6 from octavenz/fix/django_3_2_compatibility

Fix / Django 3.2 compatibility

Author: Siburg

build_test/backends/mail_backend.py

@@ -1,5 +1,6 @@
-from django.core.mail.backends.smtp import EmailBackend as DjangoEmailBackend
 from django.core.mail.backends.console import EmailBackend as DjangoConsoleBackend
+from django.core.mail.backends.smtp import EmailBackend as DjangoEmailBackend
+
 
 class DevEmailBackend:
     """

build_test/migrations/0001_initial.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

build_test/migrations/0002_create_homepage.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 

build_test/models/home_page.py

@@ -1,9 +1,8 @@
-from __future__ import absolute_import, unicode_literals
 from wagtail.core.models import Page
 
+
 class HomePage(Page):
     subpage_types = [
         'wagtail_advanced_form_builder.EmailFormPage',
         'wagtail_advanced_form_builder.FormPage',
     ]
-

build_test/settings/dev.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, unicode_literals
 import os
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 
@@ -127,4 +126,3 @@
     from .local import *
 except ImportError:
     pass
-

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:

build_test/wsgi.py

@@ -7,8 +7,6 @@
 https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/
 """
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 
 from django.core.wsgi import get_wsgi_application

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

manage.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, unicode_literals
-
 import os
 import sys
 

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 }}',