fix: correct deprecated Django functionality, update Django deps (GoogleCloudPlatform#11004)

glasnt · web-flow · commit 471f68180711 · 2023-12-08T14:06:59.000-08:00
* fix: correct deprecated Django functionality, update Django deps

* lint: isort

* lint: flake8

* lint: flake8 (with --import-order-style=google)
diff --git a/appengine/standard_python3/bundled-services/mail/django/main.py b/appengine/standard_python3/bundled-services/mail/django/main.py
@@ -15,11 +15,10 @@
 import os
 
 from django.conf import settings
-from django.conf.urls import url
 from django.core.wsgi import get_wsgi_application
 from django.http import HttpResponse
-from google.appengine.api import mail
-from google.appengine.api import wrap_wsgi_app
+from django.urls import re_path
+from google.appengine.api import mail, wrap_wsgi_app
 
 
 def home_page(request):
@@ -106,9 +105,9 @@ def receive_bounce(request):
 
 
 urlpatterns = [
-    url(r"^$", home_page),
-    url(r"^_ah/mail/.*$", receive_mail),
-    url(r"^_ah/bounce$", receive_bounce),
+    re_path(r"^$", home_page),
+    re_path(r"^_ah/mail/.*$", receive_mail),
+    re_path(r"^_ah/bounce$", receive_bounce),
 ]
 
 settings.configure(
diff --git a/appengine/standard_python3/bundled-services/mail/django/requirements.txt b/appengine/standard_python3/bundled-services/mail/django/requirements.txt
@@ -1,4 +1,6 @@
-Django==3.2.23
+Django==5.0; python_version >= "3.10"
+Django==4.2.8; python_version >= "3.8" and python_version < "3.10"
+Django==3.2.23; python_version < "3.8"
 django-environ==0.10.0
 google-cloud-logging==3.5.0
 appengine-python-standard>=0.2.3
