Fix deprecation warnings (#336)

Author: nitely

spirit/admin/urls.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import include, re_path
+from django.urls import path
+from django.urls import include
 
 from . import views
 import spirit.category.admin.urls
@@ -11,12 +12,12 @@
 
 app_name = 'admin'
 urlpatterns = [
-    re_path(r'^$', views.dashboard, name='index'),
-    re_path(r'^dashboard/$', views.dashboard, name='dashboard'),
-    re_path(r'^config/$', views.config_basic, name='config-basic'),
+    path('', views.dashboard, name='index'),
+    path('dashboard/', views.dashboard, name='dashboard'),
+    path('config/', views.config_basic, name='config-basic'),
 
-    re_path(r'^category/', include(spirit.category.admin.urls)),
-    re_path(r'^comment/flag/', include(spirit.comment.flag.admin.urls)),
-    re_path(r'^topic/', include(spirit.topic.admin.urls)),
-    re_path(r'^user/', include(spirit.user.admin.urls)),
+    path('category/', include(spirit.category.admin.urls)),
+    path('comment/flag/', include(spirit.comment.flag.admin.urls)),
+    path('topic/', include(spirit.topic.admin.urls)),
+    path('user/', include(spirit.user.admin.urls)),
 ]

spirit/category/admin/urls.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import re_path
+from django.urls import path
 
 from ...core.conf import settings
 from . import views
 
 
 app_name = 'category'
 urlpatterns = [
-    re_path(r'^$', views.index, name='index'),
-    re_path(r'^create/$', views.create, name='create'),
-    re_path(r'^update/(?P<category_id>[0-9]+)/$', views.update, name='update'),
+    path('', views.index, name='index'),
+    path('create/', views.create, name='create'),
+    path('update/<int:category_id>/', views.update, name='update'),
 ]
 
 if settings.ST_ORDERED_CATEGORIES:
     urlpatterns.extend([
-        re_path(r'^move-up/(?P<category_id>[0-9]+)/$', views.move_up, name='move_up'),
-        re_path(r'^move-dn/(?P<category_id>[0-9]+)/$', views.move_dn, name='move_dn')
+        path('move-up/<int:category_id>/', views.move_up, name='move_up'),
+        path('move-dn/<int:category_id>/', views.move_dn, name='move_dn')
     ])

spirit/category/urls.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 
+from django.urls import path
 from django.urls import re_path
 
 from . import views
 
 
 app_name = 'category'
 urlpatterns = [
-    re_path(r'^$', views.IndexView.as_view(), name='index'),
+    path('', views.IndexView.as_view(), name='index'),
 
-    re_path(r'^(?P<pk>[0-9]+)/$', views.detail, kwargs={'slug': "", }, name='detail'),
+    path('<int:pk>/', views.detail, kwargs={'slug': "", }, name='detail'),
     re_path(r'^(?P<pk>[0-9]+)/(?P<slug>[\w-]+)/$', views.detail, name='detail'),
 ]

spirit/comment/bookmark/tests.py

@@ -27,7 +27,7 @@ def test_bookmark_create(self):
         utils.login(self)
         form_data = {'comment_number': 999, }
         response = self.client.post(reverse('spirit:comment:bookmark:create', kwargs={'topic_id': self.topic.pk, }),
-                                    HTTP_X_REQUESTED_WITH='XMLHttpRequest',
+                                    headers={"x-requested-with": 'XMLHttpRequest'}, 
                                     data=form_data)
         self.assertEqual(response.status_code, 200)
 

spirit/comment/bookmark/urls.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 
 app_name = 'bookmark'
 urlpatterns = [
-    re_path(r'^(?P<topic_id>[0-9]+)/create/$', views.create, name='create'),
-    re_path(r'^(?P<topic_id>[0-9]+)/find/$', views.find, name='find'),
+    path('<int:topic_id>/create/', views.create, name='create'),
+    path('<int:topic_id>/find/', views.find, name='find'),
 ]

spirit/comment/flag/admin/urls.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 
 app_name = 'flag'
 urlpatterns = [
-    re_path(r'^$', views.opened, name='index'),
-    re_path(r'^opened/$', views.opened, name='opened'),
-    re_path(r'^closed/$', views.closed, name='closed'),
-    re_path(r'^(?P<pk>[0-9]+)/$', views.detail, name='detail'),
+    path('', views.opened, name='index'),
+    path('opened/', views.opened, name='opened'),
+    path('closed/', views.closed, name='closed'),
+    path('<int:pk>/', views.detail, name='detail'),
 ]

spirit/comment/flag/urls.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 
 app_name = 'flag'
 urlpatterns = [
-    re_path(r'^(?P<comment_id>[0-9]+)/create/$', views.create, name='create'),
+    path('<int:comment_id>/create/', views.create, name='create'),
 ]

spirit/comment/history/urls.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 
 app_name = 'history'
 urlpatterns = [
-    re_path(r'^(?P<comment_id>[0-9]+)/$', views.detail, name='detail'),
+    path('<int:comment_id>/', views.detail, name='detail'),
 ]

spirit/comment/like/urls.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 
 app_name = 'like'
 urlpatterns = [
-    re_path(r'^(?P<comment_id>[0-9]+)/create/$', views.create, name='create'),
-    re_path(r'^(?P<pk>[0-9]+)/delete/$', views.delete, name='delete'),
+    path('<int:comment_id>/create/', views.create, name='create'),
+    path('<int:pk>/delete/', views.delete, name='delete'),
 ]

spirit/comment/poll/urls.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 
 app_name = 'poll'
 urlpatterns = [
-    re_path(r'^close/(?P<pk>[0-9]+)/$', views.close_or_open, name='close'),
-    re_path(r'^open/(?P<pk>[0-9]+)/$',
+    path('close/<int:pk>/', views.close_or_open, name='close'),
+    path('open/<int:pk>/',
         views.close_or_open,
         kwargs={'close': False},
         name='open'),
-    re_path(r'^vote/(?P<pk>[0-9]+)/$', views.vote, name='vote'),
-    re_path(r'^voters/(?P<pk>[0-9]+)/$', views.voters, name='voters'),
+    path('vote/<int:pk>/', views.vote, name='vote'),
+    path('voters/<int:pk>/', views.voters, name='voters'),
 ]