Skip to content

Commit 68a7a39

Browse files
authored
Remove warning deprecated django methods (#220)
* 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()
1 parent 421b7da commit 68a7a39

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

machina/apps/forum/admin.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from collections import OrderedDict
1010

11-
from django.conf.urls import url
11+
from django.conf.urls import re_path
1212
from django.contrib import admin
1313
from django.contrib.admin import helpers
1414
from django.contrib.auth import get_user_model
@@ -70,57 +70,57 @@ def get_urls(self):
7070
""" Returns the URLs associated with the admin abstraction. """
7171
urls = super().get_urls()
7272
forum_admin_urls = [
73-
url(
73+
re_path(
7474
r'^(?P<forum_id>[0-9]+)/move-forum/(?P<direction>up|down)/$',
7575
self.admin_site.admin_view(self.moveforum_view),
7676
name='forum_forum_move',
7777
),
78-
url(
78+
re_path(
7979
r'^edit-global-permissions/$',
8080
self.admin_site.admin_view(self.editpermissions_index_view),
8181
name='forum_forum_editpermission_index',
8282
),
83-
url(
83+
re_path(
8484
r'^edit-global-permissions/user/(?P<user_id>[0-9]+)/$',
8585
self.admin_site.admin_view(self.editpermissions_user_view),
8686
name='forum_forum_editpermission_user',
8787
),
88-
url(
88+
re_path(
8989
r'^edit-global-permissions/user/anonymous/$',
9090
self.admin_site.admin_view(self.editpermissions_anonymous_user_view),
9191
name='forum_forum_editpermission_anonymous_user',
9292
),
93-
url(
93+
re_path(
9494
r'^edit-global-permissions/user/authenticated/$',
9595
self.admin_site.admin_view(self.editpermissions_authenticated_user_view),
9696
name='forum_forum_editpermission_authenticated_user',
9797
),
98-
url(
98+
re_path(
9999
r'^edit-global-permissions/group/(?P<group_id>[0-9]+)/$',
100100
self.admin_site.admin_view(self.editpermissions_group_view),
101101
name='forum_forum_editpermission_group',
102102
),
103-
url(
103+
re_path(
104104
r'^(?P<forum_id>[0-9]+)/edit-permissions/$',
105105
self.admin_site.admin_view(self.editpermissions_index_view),
106106
name='forum_forum_editpermission_index',
107107
),
108-
url(
108+
re_path(
109109
r'^(?P<forum_id>[0-9]+)/edit-permissions/user/(?P<user_id>[0-9]+)/$',
110110
self.admin_site.admin_view(self.editpermissions_user_view),
111111
name='forum_forum_editpermission_user',
112112
),
113-
url(
113+
re_path(
114114
r'^(?P<forum_id>[0-9]+)/edit-permissions/user/anonymous/$',
115115
self.admin_site.admin_view(self.editpermissions_anonymous_user_view),
116116
name='forum_forum_editpermission_anonymous_user',
117117
),
118-
url(
118+
re_path(
119119
r'^(?P<forum_id>[0-9]+)/edit-permissions/user/authenticated/$',
120120
self.admin_site.admin_view(self.editpermissions_authenticated_user_view),
121121
name='forum_forum_editpermission_authenticated_user',
122122
),
123-
url(
123+
re_path(
124124
r'^(?P<forum_id>[0-9]+)/edit-permissions/group/(?P<group_id>[0-9]+)/$',
125125
self.admin_site.admin_view(self.editpermissions_group_view),
126126
name='forum_forum_editpermission_group',

machina/apps/forum/signals.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99
import django.dispatch
1010

1111

12+
# Arguments:"previous_parent"
1213
forum_moved = django.dispatch.Signal(providing_args=["previous_parent", ])
14+
# Arguments:"forum", "user", "request", "response"
1315
forum_viewed = django.dispatch.Signal(providing_args=["forum", "user", "request", "response", ])

machina/apps/forum_conversation/signals.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
import django.dispatch
1010

1111

12-
topic_viewed = django.dispatch.Signal(providing_args=["topic", "user", "request", "response", ])
12+
# "topic", "user", "request", "response"
13+
topic_viewed = django.dispatch.Signal()

machina/urls.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
"""
88

9-
from django.conf.urls import include, url
9+
from django.conf.urls import include, re_path
1010

1111
from machina.core.loading import get_class
1212
from machina.core.urls import URLPatternsFactory
@@ -26,13 +26,13 @@ class BoardURLPatternsFactory(URLPatternsFactory):
2626
def get_urlpatterns(self):
2727
""" Returns the URL patterns managed by the considered factory / application. """
2828
return [
29-
url(r'', include(self.forum_urlpatterns_factory.urlpatterns)),
30-
url(r'', include(self.conversation_urlpatterns_factory.urlpatterns)),
31-
url(r'^feeds/', include(self.feeds_urlpatterns_factory.urlpatterns)),
32-
url(r'^member/', include(self.member_urlpatterns_factory.urlpatterns)),
33-
url(r'^moderation/', include(self.moderation_urlpatterns_factory.urlpatterns)),
34-
url(r'^search/', include(self.search_urlpatterns_factory.urlpatterns)),
35-
url(r'^tracking/', include(self.tracking_urlpatterns_factory.urlpatterns)),
29+
re_path(r'', include(self.forum_urlpatterns_factory.urlpatterns)),
30+
re_path(r'', include(self.conversation_urlpatterns_factory.urlpatterns)),
31+
re_path(r'^feeds/', include(self.feeds_urlpatterns_factory.urlpatterns)),
32+
re_path(r'^member/', include(self.member_urlpatterns_factory.urlpatterns)),
33+
re_path(r'^moderation/', include(self.moderation_urlpatterns_factory.urlpatterns)),
34+
re_path(r'^search/', include(self.search_urlpatterns_factory.urlpatterns)),
35+
re_path(r'^tracking/', include(self.tracking_urlpatterns_factory.urlpatterns)),
3636
]
3737

3838

0 commit comments

Comments
 (0)