diff --git a/evennia/web/urls.py b/evennia/web/urls.py index 6d9e28f6df..22db55cde6 100644 --- a/evennia/web/urls.py +++ b/evennia/web/urls.py @@ -6,7 +6,7 @@ # http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3 # -from django.conf.urls import url, include +from django.urls import path, include from django.views.generic import RedirectView # Setup the root url tree from / @@ -14,9 +14,10 @@ from django.views.generic import RedirectView urlpatterns = [ # Front page (note that we shouldn't specify namespace here since we will # not be able to load django-auth/admin stuff (will probably work in Django>1.9) - url(r"^", include("evennia.web.website.urls")), # , namespace='website', app_name='website')), + path("", include("evennia.web.website.urls")), # webclient - url(r"^webclient/", include("evennia.web.webclient.urls", namespace="webclient")), + path("webclient/", include("evennia.web.webclient.urls")), # favicon - url(r"^favicon\.ico$", RedirectView.as_view(url="/media/images/favicon.ico", permanent=False)), + path("favicon.ico", RedirectView.as_view( + url="/media/images/favicon.ico", permanent=False)) ] diff --git a/evennia/web/webclient/urls.py b/evennia/web/webclient/urls.py index cfb57ad262..4b9d19d631 100644 --- a/evennia/web/webclient/urls.py +++ b/evennia/web/webclient/urls.py @@ -2,8 +2,9 @@ This structures the (simple) structure of the webpage 'application'. """ -from django.conf.urls import * +from django.urls import path from evennia.web.webclient import views as webclient_views app_name = "webclient" -urlpatterns = [url(r"^$", webclient_views.webclient, name="index")] + +urlpatterns = [path("", webclient_views.webclient, name="index")]