From b0cdd82eb8dcf118d4fd40ccd442ad9125fd7dbf Mon Sep 17 00:00:00 2001
From: Ernesto Rico Schmidt <ernesto@helsinki.at>
Date: Mon, 17 Jan 2022 17:51:26 -0400
Subject: [PATCH] Upgrade program to Django 3.2
---
program/admin.py | 2 +-
program/models.py | 2 +-
program/urls.py | 4 ++--
program/views.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/admin.py b/program/admin.py
index 01d4c493..0e265009 100644
--- a/program/admin.py
+++ b/program/admin.py
@@ -20,7 +20,7 @@
from django.contrib import admin
from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
from .models import Language, Type, MusicFocus, Category, Topic, FundingCategory, Host
diff --git a/program/models.py b/program/models.py
index a404bb8d..d6c73096 100644
--- a/program/models.py
+++ b/program/models.py
@@ -31,7 +31,7 @@ from django.db.models import Q
from django.forms.models import model_to_dict
from django.urls import reverse
from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
from versatileimagefield.fields import VersatileImageField, PPOIField
from steering.settings import THUMBNAIL_SIZES, AUTO_SET_UNTIL_DATE_TO_END_OF_YEAR, AUTO_SET_UNTIL_DATE_TO_DAYS_IN_FUTURE
diff --git a/program/urls.py b/program/urls.py
index ab21bb1a..26118e22 100644
--- a/program/urls.py
+++ b/program/urls.py
@@ -21,12 +21,12 @@
import os
from django.conf import settings
-from django.conf.urls import url
+from django.urls import path
from django.views.static import serve
PROGRAM_SITE_MEDIA = os.path.join(os.path.dirname(__file__), '../site_media')
if settings.DEBUG:
- urlpatterns = [url(r'^static/(?P<path>.*)$', serve, {'document_root': PROGRAM_SITE_MEDIA})]
+ urlpatterns = [path('static/<path>', serve, {'document_root': PROGRAM_SITE_MEDIA})]
else:
urlpatterns = []
diff --git a/program/views.py b/program/views.py
index 194fdd59..3fde8e1c 100644
--- a/program/views.py
+++ b/program/views.py
@@ -27,7 +27,7 @@ from django.db.models import Q
from django.http import HttpResponse
from django.shortcuts import get_object_or_404
from django.utils import timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
from rest_framework import permissions, status, viewsets
from rest_framework.pagination import LimitOffsetPagination
from rest_framework.response import Response
--
GitLab