diff --git a/infoscreen/models.py b/infoscreen/models.py index d879fdc..e657e75 100644 --- a/infoscreen/models.py +++ b/infoscreen/models.py @@ -7,7 +7,7 @@ from django import forms from django.utils import timezone from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ class InfoItem(models.Model): diff --git a/infoscreen/urls.py b/infoscreen/urls.py index 68275cc..e6ecf2c 100644 --- a/infoscreen/urls.py +++ b/infoscreen/urls.py @@ -1,6 +1,6 @@ """File containing infoscreen urls.""" -from django.conf.urls import url +from django.urls import re_path from django.conf import settings from infoscreen.views import index @@ -27,28 +27,28 @@ from infoscreen.views import createApyItem from infoscreen.views import get_apy_json urlpatterns = [ - url(r"^$", default), - url(r"^admin$", admin), - url(r"^(?P\d+)$", index), - url(r"^items$", info_items), - url(r"^rotation/(?P\d+)$", rotation), - url(r"^rotations$", rotations), - url(r"^instance$", createInstance), - url(r"^instance/(?P\d+)$", deleteInstance), - url(r"^types$", info_types), - url(r"^delete_item/(?P\d+)/(?P\d+)$", delete_info_item), - url(r"^create_external_image$", createExternalImageInfoItem), - url(r"^create_image$", create_image_item), - url(r"^create_video$", create_video_item), - url(r"^create_abbitem$", createABBItem), - url(r"^create_sossoitem$", createSossoItem), - url(r"^create_lunchitem$", createLunchItem), - url(r"^create_eventitem$", createEventItem), - url(r"^create_apyitem$", createApyItem), - url(r"^create_websiteitem$", createExternalWebsiteItem), - url(r"^create_rotation$", create_rotation), - url(r"^delete_rotation/(?P\d+)$", delete_rotation), - url(r"^apyjson", get_apy_json), + re_path(r"^$", default), + re_path(r"^admin$", admin), + re_path(r"^(?P\d+)$", index), + re_path(r"^items$", info_items), + re_path(r"^rotation/(?P\d+)$", rotation), + re_path(r"^rotations$", rotations), + re_path(r"^instance$", createInstance), + re_path(r"^instance/(?P\d+)$", deleteInstance), + re_path(r"^types$", info_types), + re_path(r"^delete_item/(?P\d+)/(?P\d+)$", delete_info_item), + re_path(r"^create_external_image$", createExternalImageInfoItem), + re_path(r"^create_image$", create_image_item), + re_path(r"^create_video$", create_video_item), + re_path(r"^create_abbitem$", createABBItem), + re_path(r"^create_sossoitem$", createSossoItem), + re_path(r"^create_lunchitem$", createLunchItem), + re_path(r"^create_eventitem$", createEventItem), + re_path(r"^create_apyitem$", createApyItem), + re_path(r"^create_websiteitem$", createExternalWebsiteItem), + re_path(r"^create_rotation$", create_rotation), + re_path(r"^delete_rotation/(?P\d+)$", delete_rotation), + re_path(r"^apyjson", get_apy_json), ] if settings.DEBUG: diff --git a/kaehmy/forms.py b/kaehmy/forms.py index 9784c12..fb42a41 100644 --- a/kaehmy/forms.py +++ b/kaehmy/forms.py @@ -1,5 +1,5 @@ from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.core.exceptions import ValidationError from kaehmy.models import PresetRole, CustomRole, Application, Comment, BaseRole diff --git a/kaehmy/models.py b/kaehmy/models.py index eb605da..e491733 100644 --- a/kaehmy/models.py +++ b/kaehmy/models.py @@ -1,6 +1,6 @@ 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 _ VERBOSE_NAME = _("Kaehmy") diff --git a/kaehmy/tables.py b/kaehmy/tables.py index 90baba7..f027b9d 100644 --- a/kaehmy/tables.py +++ b/kaehmy/tables.py @@ -1,6 +1,6 @@ import django_tables2 as tables from django.db.models import Count, Q -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from kaehmy.models import Application diff --git a/kaehmy/urls.py b/kaehmy/urls.py index ce1bbb2..a5d7ece 100644 --- a/kaehmy/urls.py +++ b/kaehmy/urls.py @@ -1,8 +1,8 @@ """Kaehmy urls.""" -from django.conf.urls import url +from django.urls import re_path from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from kaehmy.views import view from kaehmy.views import list_view @@ -13,12 +13,12 @@ from kaehmy.views import export_view urlpatterns = [ # kaehmy - url(r"^new", view), - url(r"^submit", submit), - url(r"^add_comment", comment), - url(r"^statistics", statistics_view), - url(r"^export", export_view), - url(r"^$", list_view), + re_path(r"^new", view), + re_path(r"^submit", submit), + re_path(r"^add_comment", comment), + re_path(r"^statistics", statistics_view), + re_path(r"^export", export_view), + re_path(r"^$", list_view), ] if settings.DEBUG: diff --git a/members/forms.py b/members/forms.py index b10cda4..d711371 100644 --- a/members/forms.py +++ b/members/forms.py @@ -2,7 +2,7 @@ from django import forms from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from members.models import Member, Payment, Request diff --git a/members/models.py b/members/models.py index d7f62e6..928a04a 100644 --- a/members/models.py +++ b/members/models.py @@ -2,7 +2,7 @@ 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 _ from django.db.models import Q, OuterRef, Subquery diff --git a/members/tables.py b/members/tables.py index 2487a87..3f06346 100644 --- a/members/tables.py +++ b/members/tables.py @@ -1,7 +1,7 @@ """File containing member application django tables.""" import django_tables2 as tables -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.core.exceptions import ObjectDoesNotExist from django.db.models import F, OuterRef, Subquery from django.utils import timezone diff --git a/members/urls.py b/members/urls.py index fac0273..a8e46bc 100644 --- a/members/urls.py +++ b/members/urls.py @@ -1,6 +1,6 @@ """File containing Member application URLs.""" -from django.conf.urls import url +from django.urls import re_path from django.conf import settings from django.contrib.auth.decorators import login_required, permission_required @@ -42,61 +42,61 @@ from members.views import application_submit urlpatterns = [ # landing page - url(r"^$", member_list), - url(r"^list$", member_list), + re_path(r"^$", member_list), + re_path(r"^list$", member_list), # add member form view - url(r"^add$", member_add), + re_path(r"^add$", member_add), # add many members view - url(r"^add_many$", member_add_many), + re_path(r"^add_many$", member_add_many), # edit member information view - url(r"^edit/(?P\d+)$", member_edit), + re_path(r"^edit/(?P\d+)$", member_edit), # delete confirmation view - url(r"^delete_member_confirm/(?P\d+)$", member_delete_confirm), + re_path(r"^delete_member_confirm/(?P\d+)$", member_delete_confirm), # list all member applications - url(r"^applications$", application_list), + re_path(r"^applications$", application_list), # edit member application - url(r"^edit_application/(?P\d+)$", application_edit), + re_path(r"^edit_application/(?P\d+)$", application_edit), # post request targets - url(r"^submit_member$", member_submit), - url(r"^update_member$", member_update), - url(r"^delete_member$", member_delete), - url(r"^submit_payment$", payment_submit), - url(r"^update_payment$", payment_update), - url(r"^delete_payment$", payment_delete), - url(r"^submit_application$", application_submit), - url(r"^accept_application$", application_accept), - url(r"^delete_application$", application_delete), + re_path(r"^submit_member$", member_submit), + re_path(r"^update_member$", member_update), + re_path(r"^delete_member$", member_delete), + re_path(r"^submit_payment$", payment_submit), + re_path(r"^update_payment$", payment_update), + re_path(r"^delete_payment$", payment_delete), + re_path(r"^submit_application$", application_submit), + re_path(r"^accept_application$", application_accept), + re_path(r"^delete_application$", application_delete), # the actual member application form - url(r"^application/$", application_form), + re_path(r"^application/$", application_form), # delete confirmation view for applications - url(r"^delete_application_confirm/(?P\d+)$", application_delete_confirm), + re_path(r"^delete_application_confirm/(?P\d+)$", application_delete_confirm), # list all payment events - url(r"^payments$", payment_list), + re_path(r"^payments$", payment_list), # add payment event - url(r"^add_payment$", payment_add), + re_path(r"^add_payment$", payment_add), # edit payment event - url(r"^edit_payment/(?P\d+)$", payment_edit), + re_path(r"^edit_payment/(?P\d+)$", payment_edit), # delete confirmation view - url(r"^delete_payment_confirm/(?P\d+)$", payment_delete_confirm), + re_path(r"^delete_payment_confirm/(?P\d+)$", payment_delete_confirm), # post endpoint for confirming multiple entries - url(r"^add_many_confirm$", add_many_confirm), + re_path(r"^add_many_confirm$", add_many_confirm), # settings page - url(r"^settings$", settings_page), + re_path(r"^settings$", settings_page), # send CSV member data by POST - url(r"^import_csv", import_csv), + re_path(r"^import_csv", import_csv), # export members as excel file - url(r"export_members", export_members_excel), - url(r"export_payments", export_payments_excel), - url(r"export_applications", export_applications_excel), + re_path(r"export_members", export_members_excel), + re_path(r"export_payments", export_payments_excel), + re_path(r"export_applications", export_applications_excel), # rest api url - url(r"^api/members/(?P\d+)$", MemberDetail.as_view()), + re_path(r"^api/members/(?P\d+)$", MemberDetail.as_view()), # member select autocomplete view - url( + re_path( r"^member-autocomplete/$", MemberAutoComplete.as_view(), name="member-autocomplete", ), - url(r"^check", CheckByEmail.as_view()), + re_path(r"^check", CheckByEmail.as_view()), ] if settings.DEBUG: diff --git a/members/views.py b/members/views.py index 2f15118..beb35b9 100644 --- a/members/views.py +++ b/members/views.py @@ -1,4 +1,4 @@ """File containing Members application views.""" from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ diff --git a/members/views/applications.py b/members/views/applications.py index b78fa3e..8f09194 100644 --- a/members/views/applications.py +++ b/members/views/applications.py @@ -4,7 +4,7 @@ from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponse, HttpResponseRedirect from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.forms.models import model_to_dict from django.template.loader import render_to_string diff --git a/members/views/members.py b/members/views/members.py index 2717afa..a791da2 100644 --- a/members/views/members.py +++ b/members/views/members.py @@ -10,7 +10,7 @@ from django.http import ( HttpResponseForbidden, ) from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.forms.models import model_to_dict from dal import autocomplete from django.utils import timezone diff --git a/members/views/payments.py b/members/views/payments.py index 1912260..f1f8ecf 100644 --- a/members/views/payments.py +++ b/members/views/payments.py @@ -4,7 +4,7 @@ from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponse, HttpResponseRedirect from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.forms.models import model_to_dict import logging diff --git a/members/views/utils.py b/members/views/utils.py index 2adfe87..004dea9 100644 --- a/members/views/utils.py +++ b/members/views/utils.py @@ -4,7 +4,7 @@ from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponse, HttpResponseRedirect, HttpResponseBadRequest from django.conf import settings -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from django.forms.models import model_to_dict from django_tables2.config import RequestConfig diff --git a/ohlhafv/forms.py b/ohlhafv/forms.py index 78a58ba..891c5ae 100644 --- a/ohlhafv/forms.py +++ b/ohlhafv/forms.py @@ -1,7 +1,7 @@ """File containing Ohlhafv forms.""" from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.core.exceptions import ValidationError from ohlhafv.models import OhlhafvChallenge diff --git a/ohlhafv/models.py b/ohlhafv/models.py index 249c5fc..d40a8cc 100644 --- a/ohlhafv/models.py +++ b/ohlhafv/models.py @@ -5,7 +5,7 @@ from django.utils import timezone from datetime import timedelta from django.contrib.auth.models import User from webapp.utils import month_from_now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.auth.models import User from auditlog.registry import auditlog from phonenumber_field.modelfields import PhoneNumberField diff --git a/ohlhafv/tables.py b/ohlhafv/tables.py index 8623dfc..14a2fc0 100644 --- a/ohlhafv/tables.py +++ b/ohlhafv/tables.py @@ -1,6 +1,6 @@ import django_tables2 as tables from django.db.models import Count, Q -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from ohlhafv.models import OhlhafvChallenge diff --git a/ohlhafv/urls.py b/ohlhafv/urls.py index 572edd2..47a9641 100644 --- a/ohlhafv/urls.py +++ b/ohlhafv/urls.py @@ -1,16 +1,16 @@ """Ohlhafv urls.""" -from django.conf.urls import url +from django.urls import re_path from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from ohlhafv.views import * urlpatterns = [ # ohlhafv - url(r"^submit", ohlhafv_submit), - url(r"^list", ohlhafv_list), - url(r"^$", ohlhafv_view), + re_path(r"^submit", ohlhafv_submit), + re_path(r"^list", ohlhafv_list), + re_path(r"^$", ohlhafv_view), ] if settings.DEBUG: diff --git a/ohlhafv/views.py b/ohlhafv/views.py index f6bc7f9..afbb5fb 100644 --- a/ohlhafv/views.py +++ b/ohlhafv/views.py @@ -3,7 +3,7 @@ from django.shortcuts import render from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponseRedirect -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.template.loader import render_to_string from sikweb.settings import URL diff --git a/sikweb/base.py b/sikweb/base.py index bf1467c..d117077 100644 --- a/sikweb/base.py +++ b/sikweb/base.py @@ -2,7 +2,7 @@ import os import logging import datetime from os.path import expanduser -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) diff --git a/sikweb/urls.py b/sikweb/urls.py index 74ac35f..b31c5bf 100644 --- a/sikweb/urls.py +++ b/sikweb/urls.py @@ -1,23 +1,6 @@ -"""sikweb URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/1.9/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') -Including another URLconf - 1. Add an import: from blog import urls as blog_urls - 2. Import the include() function: from django.conf.urls import url, include - 3. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls)) -""" -from django.conf.urls import url +from django.urls import re_path, include from django.contrib import admin from django.views.static import serve as static_serve -from django.conf.urls import include from django.conf.urls.static import static from django.conf import settings from django.contrib.staticfiles import views as static_views @@ -27,18 +10,20 @@ favicon_view = RedirectView.as_view(url="static/img/favicon.png", permanent=True urlpatterns = [ - url(r"", include("webapp.urls")), - url(r"^members/", include("members.urls")), - url(r"^infoscreen/", include("infoscreen.urls")), - url(r"^kaehmy/", include("kaehmy.urls")), - url(r"^ohlhafv/", include("ohlhafv.urls")), + re_path(r"", include("webapp.urls")), + re_path(r"^members/", include("members.urls")), + re_path(r"^infoscreen/", include("infoscreen.urls")), + re_path(r"^kaehmy/", include("kaehmy.urls")), + re_path(r"^ohlhafv/", include("ohlhafv.urls")), # favourite icon - url(r"^favicon\.ico$", favicon_view), + re_path(r"^favicon\.ico$", favicon_view), # admin - url(r"^admin/", admin.site.urls), + re_path(r"^admin/", admin.site.urls), # i18n default view for changing the active language - url(r"^i18n/", include("django.conf.urls.i18n")), + re_path(r"^i18n/", include("django.conf.urls.i18n")), # staticfiles default view for static files in development - url(r"^static/(?P.*)$", static_views.serve), - url(r"^media/(?P.*)$", static_serve, {"document_root": settings.MEDIA_ROOT}), + re_path(r"^static/(?P.*)$", static_views.serve), + re_path( + r"^media/(?P.*)$", static_serve, {"document_root": settings.MEDIA_ROOT} + ), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/webapp/models.py b/webapp/models.py index 3872a5c..400bef6 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -10,7 +10,7 @@ from django.dispatch import receiver import requests from uuid import uuid4 import logging -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db.models import JSONField from auditlog.registry import auditlog from polymorphic.models import PolymorphicModel diff --git a/webapp/urls.py b/webapp/urls.py index 1f9435d..5215d63 100644 --- a/webapp/urls.py +++ b/webapp/urls.py @@ -1,7 +1,6 @@ """Webapp urls.""" -from django.conf.urls import url, include -from django.urls import path +from django.urls import path, re_path, include from rest_framework import routers from rest_framework_simplejwt.views import ( TokenObtainPairView, @@ -25,9 +24,9 @@ router.register(r"tags", TagsViewSet) router.register(r"jobads", JobAdViewSet) urlpatterns = [ - url(r"^api/", include(router.urls)), + re_path(r"^api/", include(router.urls)), path(r"api/token/", TokenObtainPairView.as_view(), name="token_obtain_pair"), path(r"api/token/verify/", TokenVerifyView.as_view(), name="token_verify"), path(r"api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"), - url(r"^jwt_nginx", nginx_jwt_resp), + re_path(r"^jwt_nginx", nginx_jwt_resp), ]