Skip to content

Commit

Permalink
Remove warning deprecated django methods (#220)
Browse files Browse the repository at this point in the history
* Remove deprecated providing_args argument

RemovedInDjango40Warning: The providing_args argument is deprecated.
As it is purely documentational, it has no replacement. If you rely
on this argument as documentation, you can move the text to a code
comment or docstring.

* Remove deprecated url in favor of re_path

RemovedInDjango40Warning: django.conf.urls.url() is deprecated in favor
of django.urls.re_path()
  • Loading branch information
carofun authored Feb 3, 2021
1 parent 421b7da commit 68a7a39
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
24 changes: 12 additions & 12 deletions machina/apps/forum/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from collections import OrderedDict

from django.conf.urls import url
from django.conf.urls import re_path
from django.contrib import admin
from django.contrib.admin import helpers
from django.contrib.auth import get_user_model
Expand Down Expand Up @@ -70,57 +70,57 @@ def get_urls(self):
""" Returns the URLs associated with the admin abstraction. """
urls = super().get_urls()
forum_admin_urls = [
url(
re_path(
r'^(?P<forum_id>[0-9]+)/move-forum/(?P<direction>up|down)/$',
self.admin_site.admin_view(self.moveforum_view),
name='forum_forum_move',
),
url(
re_path(
r'^edit-global-permissions/$',
self.admin_site.admin_view(self.editpermissions_index_view),
name='forum_forum_editpermission_index',
),
url(
re_path(
r'^edit-global-permissions/user/(?P<user_id>[0-9]+)/$',
self.admin_site.admin_view(self.editpermissions_user_view),
name='forum_forum_editpermission_user',
),
url(
re_path(
r'^edit-global-permissions/user/anonymous/$',
self.admin_site.admin_view(self.editpermissions_anonymous_user_view),
name='forum_forum_editpermission_anonymous_user',
),
url(
re_path(
r'^edit-global-permissions/user/authenticated/$',
self.admin_site.admin_view(self.editpermissions_authenticated_user_view),
name='forum_forum_editpermission_authenticated_user',
),
url(
re_path(
r'^edit-global-permissions/group/(?P<group_id>[0-9]+)/$',
self.admin_site.admin_view(self.editpermissions_group_view),
name='forum_forum_editpermission_group',
),
url(
re_path(
r'^(?P<forum_id>[0-9]+)/edit-permissions/$',
self.admin_site.admin_view(self.editpermissions_index_view),
name='forum_forum_editpermission_index',
),
url(
re_path(
r'^(?P<forum_id>[0-9]+)/edit-permissions/user/(?P<user_id>[0-9]+)/$',
self.admin_site.admin_view(self.editpermissions_user_view),
name='forum_forum_editpermission_user',
),
url(
re_path(
r'^(?P<forum_id>[0-9]+)/edit-permissions/user/anonymous/$',
self.admin_site.admin_view(self.editpermissions_anonymous_user_view),
name='forum_forum_editpermission_anonymous_user',
),
url(
re_path(
r'^(?P<forum_id>[0-9]+)/edit-permissions/user/authenticated/$',
self.admin_site.admin_view(self.editpermissions_authenticated_user_view),
name='forum_forum_editpermission_authenticated_user',
),
url(
re_path(
r'^(?P<forum_id>[0-9]+)/edit-permissions/group/(?P<group_id>[0-9]+)/$',
self.admin_site.admin_view(self.editpermissions_group_view),
name='forum_forum_editpermission_group',
Expand Down
2 changes: 2 additions & 0 deletions machina/apps/forum/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
import django.dispatch


# Arguments:"previous_parent"
forum_moved = django.dispatch.Signal(providing_args=["previous_parent", ])
# Arguments:"forum", "user", "request", "response"
forum_viewed = django.dispatch.Signal(providing_args=["forum", "user", "request", "response", ])
3 changes: 2 additions & 1 deletion machina/apps/forum_conversation/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
import django.dispatch


topic_viewed = django.dispatch.Signal(providing_args=["topic", "user", "request", "response", ])
# "topic", "user", "request", "response"
topic_viewed = django.dispatch.Signal()
16 changes: 8 additions & 8 deletions machina/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"""

from django.conf.urls import include, url
from django.conf.urls import include, re_path

from machina.core.loading import get_class
from machina.core.urls import URLPatternsFactory
Expand All @@ -26,13 +26,13 @@ class BoardURLPatternsFactory(URLPatternsFactory):
def get_urlpatterns(self):
""" Returns the URL patterns managed by the considered factory / application. """
return [
url(r'', include(self.forum_urlpatterns_factory.urlpatterns)),
url(r'', include(self.conversation_urlpatterns_factory.urlpatterns)),
url(r'^feeds/', include(self.feeds_urlpatterns_factory.urlpatterns)),
url(r'^member/', include(self.member_urlpatterns_factory.urlpatterns)),
url(r'^moderation/', include(self.moderation_urlpatterns_factory.urlpatterns)),
url(r'^search/', include(self.search_urlpatterns_factory.urlpatterns)),
url(r'^tracking/', include(self.tracking_urlpatterns_factory.urlpatterns)),
re_path(r'', include(self.forum_urlpatterns_factory.urlpatterns)),
re_path(r'', include(self.conversation_urlpatterns_factory.urlpatterns)),
re_path(r'^feeds/', include(self.feeds_urlpatterns_factory.urlpatterns)),
re_path(r'^member/', include(self.member_urlpatterns_factory.urlpatterns)),
re_path(r'^moderation/', include(self.moderation_urlpatterns_factory.urlpatterns)),
re_path(r'^search/', include(self.search_urlpatterns_factory.urlpatterns)),
re_path(r'^tracking/', include(self.tracking_urlpatterns_factory.urlpatterns)),
]


Expand Down

0 comments on commit 68a7a39

Please sign in to comment.