Django 4+ changes

sandbox/sandbox/apps/user/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from django.contrib.auth.forms import ReadOnlyPasswordHashField
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from sandbox.apps.user import models
 

sandbox/sandbox/apps/user/models.py

@@ -3,7 +3,7 @@ from django.contrib.auth.models import (
 from django.core.mail import send_mail
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class UserManager(BaseUserManager):

sandbox/sandbox/urls.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import debug_toolbar
 from django.conf import settings
-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 import VERSION as WAGTAIL_VERSION
@@ -17,17 +17,17 @@ from wagtail.documents import urls as wagtaildocs_urls
 from sandbox.apps.search import views as search_views
 
 urlpatterns = [
-    url(r'^django-admin/', admin.site.urls),
+    re_path(r'^django-admin/', admin.site.urls),
 
-    url(r'^admin/', include(wagtailadmin_urls)),
-    url(r'^documents/', include(wagtaildocs_urls)),
+    re_path(r'^admin/', include(wagtailadmin_urls)),
+    re_path(r'^documents/', include(wagtaildocs_urls)),
 
-    url(r'^search/$', search_views.search, name='search'),
+    re_path(r'^search/$', search_views.search, name='search'),
 
     # For anything not caught by a more specific rule above, hand over to
     # Wagtail's page serving mechanism. This should be the last pattern in
     # the list:
-    url(r'', include(wagtail_urls)),
+    re_path(r'', include(wagtail_urls)),
 
     # Alternatively, if you want Wagtail pages to be served from a subpath
     # of your site, rather than the site root:
@@ -44,5 +44,5 @@ if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
     urlpatterns = [
-        url(r'^__debug__/', include(debug_toolbar.urls)),
+        re_path(r'^__debug__/', include(debug_toolbar.urls)),
     ] + urlpatterns

src/wagtail_personalisation/__init__.py

@@ -1 +1 @@
-default_app_config = 'wagtail_personalisation.config.WagtailPersonalisationConfig'
+# default_app_config = 'wagtail_personalisation.config.WagtailPersonalisationConfig'

src/wagtail_personalisation/admin_urls.py

@@ -1,16 +1,16 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from wagtail_personalisation import views
 
 app_name = 'segment'
 
 urlpatterns = [
-    url(r'^segment/(?P<segment_id>[0-9]+)/toggle/$',
+    re_path(r'^segment/(?P<segment_id>[0-9]+)/toggle/$',
         views.toggle, name='toggle'),
-    url(r'^(?P<page_id>[0-9]+)/copy/(?P<segment_id>[0-9]+)$',
+    re_path(r'^(?P<page_id>[0-9]+)/copy/(?P<segment_id>[0-9]+)$',
         views.copy_page_view, name='copy_page'),
-    url(r'^segment/toggle_segment_view/$',
+    re_path(r'^segment/toggle_segment_view/$',
         views.toggle_segment_view, name='toggle_segment_view'),
-    url(r'^segment/users/(?P<segment_id>[0-9]+)$',
+    re_path(r'^segment/users/(?P<segment_id>[0-9]+)$',
         views.segment_user_data, name='segment_user_data'),
 ]

src/wagtail_personalisation/blocks.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from wagtail import VERSION as WAGTAIL_VERSION
 

src/wagtail_personalisation/config.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class WagtailPersonalisationConfig(AppConfig):

src/wagtail_personalisation/forms.py

@@ -7,7 +7,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
 from django.templatetags.static import static
 from django.test.client import RequestFactory
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.forms import WagtailAdminModelForm
 
 SessionStore = import_module(settings.SESSION_ENGINE).SessionStore

src/wagtail_personalisation/models.py

@@ -8,7 +8,7 @@ from django.db import models, transaction
 from django.template.defaultfilters import slugify
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.models import ClusterableModel
 from wagtail import VERSION as WAGTAIL_VERSION
 

src/wagtail_personalisation/rules.py

@@ -11,7 +11,7 @@ from django.db import models
 from django.template.defaultfilters import slugify
 from django.test.client import RequestFactory
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from modelcluster.fields import ParentalKey
 from user_agents import parse
 from wagtail import VERSION as WAGTAIL_VERSION

src/wagtail_personalisation/views.py

@@ -7,7 +7,7 @@ from django.http import (
     HttpResponse, HttpResponseForbidden, HttpResponseRedirect)
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
 from wagtail.contrib.modeladmin.views import DeleteView, IndexView
 from wagtail import VERSION as WAGTAIL_VERSION

src/wagtail_personalisation/wagtail_hooks.py

@@ -1,6 +1,6 @@
 import logging
 
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.db import transaction
 from django.db.models import F
 from django.http import Http404
@@ -8,7 +8,7 @@ from django.shortcuts import redirect, render
 from django.template.defaultfilters import pluralize
 from django.urls import reverse
 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 import VERSION as WAGTAIL_VERSION
 
 if WAGTAIL_VERSION >= (3, 0):
@@ -34,7 +34,7 @@ logger = logging.getLogger(__name__)
 def register_admin_urls():
     """Adds the administration urls for the personalisation apps."""
     return [
-        url(
+        re_path(
             r"^personalisation/",
             include(admin_urls, namespace="wagtail_personalisation"),
         )

tests/site/urls.py

@@ -1,16 +1,16 @@
 from __future__ import absolute_import, unicode_literals
 
-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
 from wagtail.documents import urls as wagtaildocs_urls
 
 urlpatterns = [
-    url(r'^django-admin/', admin.site.urls),
+    re_path(r'^django-admin/', admin.site.urls),
 
-    url(r'^admin/', include(wagtailadmin_urls)),
-    url(r'^documents/', include(wagtaildocs_urls)),
+    re_path(r'^admin/', include(wagtailadmin_urls)),
+    re_path(r'^documents/', include(wagtaildocs_urls)),
 
-    url(r'', include(wagtail_urls)),
+    re_path(r'', include(wagtail_urls)),
 ]