Replaced django.conf.urls.url by django.urls.re_path

This commit is contained in:
2025-04-10 12:14:35 +02:00
parent e953dcc7e0
commit b70fbbfa90
7 changed files with 39 additions and 39 deletions

View File

@@ -3,7 +3,7 @@ import os
import pkg_resources
from django.conf import settings
from django.conf.urls import url as django_conf_url, include
from django.urls import re_path, include
DJANGO_MAIN_MODULE = 'main'
MODULE_CONFIG_FILE_NAME = 'module_config.json'
@@ -50,7 +50,7 @@ class ModuleMeta:
def url_conf_pattern(self):
url_pattern = '^{}/'.format(self.url_prefix)
url_conf = self._package_name + '.urls'
return django_conf_url(url_pattern, include(url_conf, self.url_namespace))
return re_path(url_pattern, include(url_conf, self.url_namespace))
def _load_from_package(self):
package_name = self._package_name

View File

@@ -1,5 +1,5 @@
from django.conf import settings
from django.conf.urls import url, include
from django.urls import re_path, include
urlpatterns = []
@@ -8,5 +8,5 @@ for module_meta_obj in settings.MODULE_CONFIG.modules.values():
urlpatterns.append(module_meta_obj.url_conf_pattern)
urlpatterns += [
url(r'^', include('dav_base.urls'))
re_path(r'^', include('dav_base.urls'))
]

View File

@@ -1,11 +1,11 @@
from django.conf.urls import url
from django.urls import re_path
from django.contrib import admin
from django.views import generic
from . import views
urlpatterns = [
url(r'^$', views.RootView.as_view(), name='root'),
url(r'^css-demo$', generic.TemplateView.as_view(template_name='dav_base/css_demo.html'), name='css-demo'),
url(r'^djangoadmin/', admin.site.urls),
re_path(r'^$', views.RootView.as_view(), name='root'),
re_path(r'^css-demo$', generic.TemplateView.as_view(template_name='dav_base/css_demo.html'), name='css-demo'),
re_path(r'^djangoadmin/', admin.site.urls),
]