Change url() to path()

evennia/web/admin/urls.py

@@ -6,26 +6,28 @@ These patterns are all under the admin/* namespace.
 """
 from django.conf import settings
 from django.contrib import admin
-from django.conf.urls import url, include
+from django.urls import path, include
 from . import frontpage
 
 
 urlpatterns = [
-    # Django original admin page. Make this URL is always available, whether
+    # Django original admin page. Make this URL always available, whether
     # we've chosen to use Evennia's custom admin or not.
-    url(r"django/", frontpage.admin_wrapper, name="django_admin"),
+    path("django/", frontpage.admin_wrapper, name="django_admin"),
     # Admin docs
-    url(r"doc/", include("django.contrib.admindocs.urls")),
+    path("doc/", include("django.contrib.admindocs.urls")),
 ]
 
 if settings.EVENNIA_ADMIN:
 
     urlpatterns += [
         # Our override for the admin.
-        url("^$", frontpage.evennia_admin, name="evennia_admin"),
+        path("", frontpage.evennia_admin, name="evennia_admin"),
         # Makes sure that other admin pages get loaded.
-        url(r"^", admin.site.urls),
+        path("", admin.site.urls),
     ]
 else:
     # Just include the normal Django admin.
-    urlpatterns += [url(r"^/", admin.site.urls)]
+    urlpatterns += [
+        path("", admin.site.urls)
+    ]

evennia/web/urls.py

@@ -16,8 +16,6 @@ This is the starting point when a user enters an URL.
 
 """
 
-
-from django.conf.urls import url
 from django.conf import settings
 from django.urls import path, include
 from django.views.generic import RedirectView
@@ -38,4 +36,4 @@ urlpatterns = [
 
 if settings.REST_API_ENABLED:
     # Rest API
-    urlpatterns += [url(r"^api/", include("evennia.web.api.urls", namespace="api"))]
+    urlpatterns += [path("api/", include("evennia.web.api.urls", namespace="api"))]

evennia/web/webclient/urls.py

@@ -7,4 +7,6 @@ from . import views
 
 app_name = "webclient"
 
-urlpatterns = [path("", views.webclient, name="index")]
+urlpatterns = [
+    path("", views.webclient, name="index")
+]

evennia/web/website/urls.py

@@ -4,71 +4,76 @@ This structures the website.
 """
 from django.conf import settings
 from django.contrib import admin
-from django.conf.urls import url, include
+from django.urls import path, include
 from django import views as django_views
 from .views import (index, errors, accounts, help as helpviews, channels,
                     characters)
 
 urlpatterns = [
     # website front page
-    url(r"^$", index.EvenniaIndexView.as_view(), name="index"),
+    #url(r"^$", index.EvenniaIndexView.as_view(), name="index"),
+    path("", index.EvenniaIndexView.as_view(), name="index"),
 
     # errors
-    url(r"^tbi/", errors.to_be_implemented, name="to_be_implemented"),
+    path(r"tbi/", errors.to_be_implemented, name="to_be_implemented"),
 
     # User Authentication (makes login/logout url names available)
-    url(r"^auth/register", accounts.AccountCreateView.as_view(), name="register"),
-    url(r"^auth/", include("django.contrib.auth.urls")),
+    path("auth/register", accounts.AccountCreateView.as_view(), name="register"),
+    path("auth/", include("django.contrib.auth.urls")),
 
     # Help Topics
-    url(r"^help/$", helpviews.HelpListView.as_view(), name="help"),
-    url(r"^help/(?P<category>[\w\d\-]+)/(?P<topic>[\w\d\-]+)/$",
-        helpviews.HelpDetailView.as_view(),
-        name="help-entry-detail"),
+    path("help/", helpviews.HelpListView.as_view(), name="help"),
+    # url(r"^help/(?P<category>[\w\d\-]+)/(?P<topic>[\w\d\-]+)/$",
+    #     helpviews.HelpDetailView.as_view(),
+    #     name="help-entry-detail"),
+    path(r"help/<str:category>/<str:topic>/",
+         helpviews.HelpDetailView.as_view(),
+         name="help-entry-detail"),
 
     # Channels
-    url(r"^channels/$", channels.ChannelListView.as_view(), name="channels"),
-    url(r"^channels/(?P<slug>[\w\d\-]+)/$",
-        channels.ChannelDetailView.as_view(),
-        name="channel-detail"),
+    path("channels/", channels.ChannelListView.as_view(), name="channels"),
+    # url(r"^channels/(?P<slug>[\w\d\-]+)/$",
+    #     channels.ChannelDetailView.as_view(),
+    #     name="channel-detail"),
+    path("channels/<str:slug>/",
+         channels.ChannelDetailView.as_view(),
+         name="channel-detail"),
 
     # Character management
-    url(r"^characters/$", characters.CharacterListView.as_view(), name="characters"),
-    url(r"^characters/create/$",
-        characters.CharacterCreateView.as_view(),
-        name="character-create"),
-    url(r"^characters/manage/$",
-        characters.CharacterManageView.as_view(),
-        name="character-manage"),
-    url(r"^characters/detail/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
-        characters.CharacterDetailView.as_view(),
-        name="character-detail"),
-    url(r"^characters/puppet/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
-        characters.CharacterPuppetView.as_view(),
-        name="character-puppet"),
-    url(r"^characters/update/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
-        characters.CharacterUpdateView.as_view(),
-        name="character-update"),
-    url(r"^characters/delete/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
-        characters.CharacterDeleteView.as_view(),
-        name="character-delete"),
+    path("characters/", characters.CharacterListView.as_view(), name="characters"),
+    path("characters/create/",
+         characters.CharacterCreateView.as_view(),
+         name="character-create"),
+    path("characters/manage/",
+         characters.CharacterManageView.as_view(),
+         name="character-manage"),
+    path("characters/detail/<str:slug>/<int:pk>/",
+         characters.CharacterDetailView.as_view(),
+         name="character-detail"),
+    path("characters/puppet/<str:slug>/<int:pk>/",
+         characters.CharacterPuppetView.as_view(),
+         name="character-puppet"),
+    path("characters/update/<str:slug>/<int:pk>/",
+         characters.CharacterUpdateView.as_view(),
+         name="character-update"),
+    path("characters/delete/<str:slug>/<int:pk>/",
+         characters.CharacterDeleteView.as_view(),
+         name="character-delete"),
 ]
 
 
-# This sets up the server if the user want to run the Django
-# test server (this should normally not be needed).
+# This sets up the server if the user want to run the Django test server (this
+# is not recommended and is usually unnecessary).
 if settings.SERVE_MEDIA:
     urlpatterns.extend(
         [
-            url(
-                r"^media/(?P<path>.*)$",
-                django_views.static.serve,
-                {"document_root": settings.MEDIA_ROOT},
+            path("media/<str:path>",
+                 django_views.static.serve,
+                 {"document_root": settings.MEDIA_ROOT},
             ),
-            url(
-                r"^static/(?P<path>.*)$",
-                django_views.static.serve,
-                {"document_root": settings.STATIC_ROOT},
+            path("static/<str:path>",
+                 django_views.static.serve,
+                 {"document_root": settings.STATIC_ROOT},
             ),
         ]
     )