Switch to path, use re_path only when really needed

allianceauth/services/modules/discord/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,13 +7,13 @@ app_name = 'discord'
 
 module_urls = [
     # Discord Service Control
-    re_path(r'^activate/$', views.activate_discord, name='activate'),
-    re_path(r'^deactivate/$', views.deactivate_discord, name='deactivate'),
-    re_path(r'^reset/$', views.reset_discord, name='reset'),
-    re_path(r'^callback/$', views.discord_callback, name='callback'),
-    re_path(r'^add_bot/$', views.discord_add_bot, name='add_bot'),
+    path('activate/', views.activate_discord, name='activate'),
+    path('deactivate/', views.deactivate_discord, name='deactivate'),
+    path('reset/', views.reset_discord, name='reset'),
+    path('callback/', views.discord_callback, name='callback'),
+    path('add_bot/', views.discord_add_bot, name='add_bot'),
 ]
 
 urlpatterns = [
-    re_path(r'^discord/', include((module_urls, app_name), namespace=app_name))
+    path('discord/', include((module_urls, app_name), namespace=app_name))
 ]

allianceauth/services/modules/discourse/urls.py

@@ -1,8 +1,8 @@
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 urlpatterns = [
     # Discourse Service Control
-    re_path(r'^discourse/sso$', views.discourse_sso, name='auth_discourse_sso'),
+    path('discourse/sso', views.discourse_sso, name='auth_discourse_sso'),
 ]

allianceauth/services/modules/example/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 app_name = 'example'
 
@@ -8,5 +8,5 @@ module_urls = [
 ]
 
 urlpatterns = [
-    re_path(r'^example/', include((module_urls, app_name), namespace=app_name)),
+    path('example/', include((module_urls, app_name), namespace=app_name)),
 ]

allianceauth/services/modules/ips4/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,12 +7,12 @@ app_name = 'ips4'
 
 module_urls = [
     # IPS4 Service Control
-    re_path(r'^activate/$', views.activate_ips4, name='activate'),
-    re_path(r'^deactivate/$', views.deactivate_ips4, name='deactivate'),
-    re_path(r'^reset_password/$', views.reset_ips4_password, name='reset_password'),
-    re_path(r'^set_password/$', views.set_ips4_password, name='set_password'),
+    path('activate/', views.activate_ips4, name='activate'),
+    path('deactivate/', views.deactivate_ips4, name='deactivate'),
+    path('reset_password/', views.reset_ips4_password, name='reset_password'),
+    path('set_password/', views.set_ips4_password, name='set_password'),
 ]
 
 urlpatterns = [
-    re_path(r'^ips4/', include((module_urls, app_name), namespace=app_name))
+    path('ips4/', include((module_urls, app_name), namespace=app_name))
 ]

allianceauth/services/modules/mumble/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,12 +7,12 @@ app_name = 'mumble'
 
 module_urls = [
     # Mumble service control
-    re_path(r'^activate/$', views.CreateAccountMumbleView.as_view(), name='activate'),
-    re_path(r'^deactivate/$', views.DeleteMumbleView.as_view(), name='deactivate'),
-    re_path(r'^reset_password/$', views.ResetPasswordMumbleView.as_view(), name='reset_password'),
-    re_path(r'^set_password/$', views.SetPasswordMumbleView.as_view(), name='set_password'),
+    path('activate/', views.CreateAccountMumbleView.as_view(), name='activate'),
+    path('deactivate/', views.DeleteMumbleView.as_view(), name='deactivate'),
+    path('reset_password/', views.ResetPasswordMumbleView.as_view(), name='reset_password'),
+    path('set_password/', views.SetPasswordMumbleView.as_view(), name='set_password'),
 ]
 
 urlpatterns = [
-    re_path(r'^mumble/', include((module_urls, app_name), namespace=app_name))
+    path('mumble/', include((module_urls, app_name), namespace=app_name))
 ]

allianceauth/services/modules/openfire/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,13 +7,13 @@ app_name = 'openfire'
 
 module_urls = [
     # Jabber Service Control
-    re_path(r'^activate/$', views.activate_jabber, name='activate'),
-    re_path(r'^deactivate/$', views.deactivate_jabber, name='deactivate'),
-    re_path(r'^reset_password/$', views.reset_jabber_password, name='reset_password'),
-    re_path(r'^set_password/$', views.set_jabber_password, name='set_password'),
-    re_path(r'^broadcast/$', views.jabber_broadcast_view, name='broadcast'),
+    path('activate/', views.activate_jabber, name='activate'),
+    path('deactivate/', views.deactivate_jabber, name='deactivate'),
+    path('reset_password/', views.reset_jabber_password, name='reset_password'),
+    path('set_password/', views.set_jabber_password, name='set_password'),
+    path('broadcast/', views.jabber_broadcast_view, name='broadcast'),
 ]
 
 urlpatterns = [
-    re_path(r'^openfire/', include((module_urls, app_name), namespace=app_name)),
+    path('openfire/', include((module_urls, app_name), namespace=app_name)),
 ]

allianceauth/services/modules/phpbb3/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,12 +7,12 @@ app_name = 'phpbb3'
 
 module_urls = [
     # Forum Service Control
-    re_path(r'^activate/$', views.activate_forum, name='activate'),
-    re_path(r'^deactivate/$', views.deactivate_forum, name='deactivate'),
-    re_path(r'^reset_password/$', views.reset_forum_password, name='reset_password'),
-    re_path(r'^set_password/$', views.set_forum_password, name='set_password'),
+    path('activate/', views.activate_forum, name='activate'),
+    path('deactivate/', views.deactivate_forum, name='deactivate'),
+    path('reset_password/', views.reset_forum_password, name='reset_password'),
+    path('set_password/', views.set_forum_password, name='set_password'),
 ]
 
 urlpatterns = [
-    re_path(r'^phpbb3/', include((module_urls, app_name), namespace=app_name))
+    path('phpbb3/', include((module_urls, app_name), namespace=app_name))
 ]

allianceauth/services/modules/smf/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,12 +7,12 @@ app_name = 'smf'
 
 module_urls = [
     # SMF Service Control
-    re_path(r'^activate/$', views.activate_smf, name='activate'),
-    re_path(r'^deactivate/$', views.deactivate_smf, name='deactivate'),
-    re_path(r'^reset_password/$', views.reset_smf_password, name='reset_password'),
-    re_path(r'^set_password/$', views.set_smf_password, name='set_password'),
+    path('activate/', views.activate_smf, name='activate'),
+    path('deactivate/', views.deactivate_smf, name='deactivate'),
+    path('reset_password/', views.reset_smf_password, name='reset_password'),
+    path('set_password/', views.set_smf_password, name='set_password'),
 ]
 
 urlpatterns = [
-    re_path(r'^smf/', include((module_urls, app_name), namespace=app_name)),
+    path('smf/', include((module_urls, app_name), namespace=app_name)),
 ]

allianceauth/services/modules/teamspeak3/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,19 +7,19 @@ app_name = 'teamspeak3'
 
 module_urls = [
     # Teamspeak3 service control
-    re_path(r'^activate/$', views.activate_teamspeak3, name='activate'),
-    re_path(r'^deactivate/$', views.deactivate_teamspeak3, name='deactivate'),
-    re_path(r'^reset_perm/$', views.reset_teamspeak3_perm, name='reset_perm'),
-    re_path(
-        r'^admin_update_ts3_groups/$',
+    path('activate/', views.activate_teamspeak3, name='activate'),
+    path('deactivate/', views.deactivate_teamspeak3, name='deactivate'),
+    path('reset_perm/', views.reset_teamspeak3_perm, name='reset_perm'),
+    path(
+        'admin_update_ts3_groups/',
         views.admin_update_ts3_groups,
         name='admin_update_ts3_groups'
     ),
 
     # Teamspeak Urls
-    re_path(r'^verify/$', views.verify_teamspeak3, name='verify'),
+    path('verify/', views.verify_teamspeak3, name='verify'),
 ]
 
 urlpatterns = [
-    re_path(r'^teamspeak3/', include((module_urls, app_name), namespace=app_name)),
+    path('teamspeak3/', include((module_urls, app_name), namespace=app_name)),
 ]

allianceauth/services/modules/xenforo/urls.py

@@ -1,5 +1,5 @@
 from django.conf.urls import include
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
@@ -7,12 +7,12 @@ app_name = 'xenforo'
 
 module_urls = [
     # XenForo service control
-    re_path(r'^activate/$', views.activate_xenforo_forum, name='activate'),
-    re_path(r'^deactivate/$', views.deactivate_xenforo_forum, name='deactivate'),
-    re_path(r'^reset_password/$', views.reset_xenforo_password, name='reset_password'),
-    re_path(r'^set_password/$', views.set_xenforo_password, name='set_password'),
+    path('activate/', views.activate_xenforo_forum, name='activate'),
+    path('deactivate/', views.deactivate_xenforo_forum, name='deactivate'),
+    path('reset_password/', views.reset_xenforo_password, name='reset_password'),
+    path('set_password/', views.set_xenforo_password, name='set_password'),
 ]
 
 urlpatterns = [
-    re_path(r'^xenforo/', include((module_urls, app_name), namespace=app_name)),
+    path('xenforo/', include((module_urls, app_name), namespace=app_name)),
 ]