Skip to content

Commit

Permalink
Addressing deprecation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
marksweb committed Sep 12, 2021
1 parent 674b28b commit 054ae04
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 24 deletions.
6 changes: 2 additions & 4 deletions applications/admin.py
@@ -1,8 +1,7 @@
from adminsortable2.admin import SortableAdminMixin
from django.conf.urls import url
from django.contrib import admin
from django.shortcuts import redirect, render
from django.urls import reverse
from django.urls import reverse, path
from django.utils.html import format_html

from core.models import Event
Expand Down Expand Up @@ -33,8 +32,7 @@ def get_form(self, request, obj=None, **kwargs):
def get_urls(self):
urls = super().get_urls()
my_urls = [
url(r'submissions/$',
self.admin_site.admin_view(self.view_submissions)),
path('submissions/', self.admin_site.admin_view(self.view_submissions)),
]
return my_urls + urls

Expand Down
4 changes: 2 additions & 2 deletions contact/urls.py
@@ -1,8 +1,8 @@
from django.conf.urls import url
from django.urls import path

from contact.views import ContactView

app_name = 'contact'
urlpatterns = [
url(r'', ContactView.as_view(), name='contact'),
path('', ContactView.as_view(), name='contact'),
]
14 changes: 9 additions & 5 deletions core/admin/event.py
Expand Up @@ -4,7 +4,7 @@
from django.contrib import admin, messages
from django.http import HttpResponseRedirect
from django.shortcuts import redirect, render
from django.urls import reverse
from django.urls import reverse, path
from django.utils.safestring import mark_safe

from ..filters import OpenRegistrationFilter
Expand Down Expand Up @@ -120,12 +120,16 @@ def get_fieldsets(self, request, obj=None):
def get_urls(self):
urls = super(EventAdmin, self).get_urls()
my_urls = [
url(r'manage_organizers/$',
path(
'manage_organizers/',
self.admin_site.admin_view(self.view_manage_organizers),
name='core_event_manage_organizers'),
url(r'add_organizers/$',
name='core_event_manage_organizers'
),
path(
'add_organizers/',
self.admin_site.admin_view(self.view_add_organizers),
name='core_event_add_organizers'),
name='core_event_add_organizers'
),
]
return my_urls + urls

Expand Down
11 changes: 6 additions & 5 deletions organize/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin, messages
from django.conf.urls import url
from django.shortcuts import redirect, get_object_or_404, render
from django.urls import path

from .models import EventApplication, Coorganizer
from .constants import ON_HOLD, IN_REVIEW, REJECTED, ACCEPTED
Expand Down Expand Up @@ -129,10 +129,11 @@ def main_organizer(self, obj):
def get_urls(self):
urls = super(EventApplicationAdmin, self).get_urls()
my_urls = [
url(r'(?P<application_id>\d+)/triage/(?P<new_status>[\w\d/]+)/$',
self.admin_site.admin_view(
self.view_change_application_status),
name='organize_eventapplication_change_application_status'),
path(
'<int:application_id>/triage/<str:new_status>/',
self.admin_site.admin_view(self.view_change_application_status),
name='organize_eventapplication_change_application_status'
),
]
return my_urls + urls

Expand Down
2 changes: 1 addition & 1 deletion organize/models.py
Expand Up @@ -5,7 +5,7 @@
from django_extensions.db.fields import AutoSlugField
from django.db import models, transaction
from django.utils import timezone
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django_date_extensions.fields import ApproximateDateField

from core import gmail_accounts
Expand Down
2 changes: 1 addition & 1 deletion patreonmanager/admin.py
@@ -1,7 +1,7 @@
from django.contrib import admin, messages
from django.urls import reverse
from django.utils.html import format_html
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.utils.translation import ungettext

from .filters import PendingRewardsFilter
Expand Down
2 changes: 1 addition & 1 deletion patreonmanager/apps.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 PatreonManagerConfig(AppConfig):
Expand Down
2 changes: 1 addition & 1 deletion patreonmanager/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 _


class Patron(models.Model):
Expand Down
8 changes: 4 additions & 4 deletions story/urls.py
@@ -1,8 +1,8 @@
from django.conf.urls import url
from django.urls import path

from story.views import StoryListView

app_name = "story"
urlpatterns = [
url(r'^$', StoryListView.as_view(), name='stories'),
]
urlpatterns = {
path('', StoryListView.as_view(), name='stories'),
}

0 comments on commit 054ae04

Please sign in to comment.