From 68a7a399e8cfaa0927123e5dfbcb1c3228ab530e Mon Sep 17 00:00:00 2001 From: carofun <76939263+carofun@users.noreply.github.com> Date: Wed, 3 Feb 2021 01:12:29 +0100 Subject: [PATCH] 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() --- machina/apps/forum/admin.py | 24 +++++++++++----------- machina/apps/forum/signals.py | 2 ++ machina/apps/forum_conversation/signals.py | 3 ++- machina/urls.py | 16 +++++++-------- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/machina/apps/forum/admin.py b/machina/apps/forum/admin.py index eedbdf6c0..24eee76d3 100644 --- a/machina/apps/forum/admin.py +++ b/machina/apps/forum/admin.py @@ -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 @@ -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[0-9]+)/move-forum/(?Pup|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[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[0-9]+)/$', self.admin_site.admin_view(self.editpermissions_group_view), name='forum_forum_editpermission_group', ), - url( + re_path( r'^(?P[0-9]+)/edit-permissions/$', self.admin_site.admin_view(self.editpermissions_index_view), name='forum_forum_editpermission_index', ), - url( + re_path( r'^(?P[0-9]+)/edit-permissions/user/(?P[0-9]+)/$', self.admin_site.admin_view(self.editpermissions_user_view), name='forum_forum_editpermission_user', ), - url( + re_path( r'^(?P[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[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[0-9]+)/edit-permissions/group/(?P[0-9]+)/$', self.admin_site.admin_view(self.editpermissions_group_view), name='forum_forum_editpermission_group', diff --git a/machina/apps/forum/signals.py b/machina/apps/forum/signals.py index b3b440560..065cfeaf9 100644 --- a/machina/apps/forum/signals.py +++ b/machina/apps/forum/signals.py @@ -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", ]) diff --git a/machina/apps/forum_conversation/signals.py b/machina/apps/forum_conversation/signals.py index ea01f1f7d..8c320f28d 100644 --- a/machina/apps/forum_conversation/signals.py +++ b/machina/apps/forum_conversation/signals.py @@ -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() diff --git a/machina/urls.py b/machina/urls.py index fd31aa01b..65bf33dc8 100644 --- a/machina/urls.py +++ b/machina/urls.py @@ -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 @@ -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)), ]