1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Updated test URL patterns to use path() and re_path().

This commit is contained in:
Tim Graham
2018-12-07 17:52:28 -05:00
parent 1136d57f01
commit 043bd70942
104 changed files with 692 additions and 673 deletions

View File

@@ -1,20 +1,20 @@
from django.conf.urls import include, url
from django.urls import include, path
common_url_patterns = ([
url(r'^app-ns1/', include([])),
url(r'^app-url/', include([])),
path('app-ns1/', include([])),
path('app-url/', include([])),
], 'common')
nested_url_patterns = ([
url(r'^common/', include(common_url_patterns, namespace='nested')),
path('common/', include(common_url_patterns, namespace='nested')),
], 'nested')
urlpatterns = [
url(r'^app-ns1-0/', include(common_url_patterns, namespace='app-include-1')),
url(r'^app-ns1-1/', include(common_url_patterns, namespace='app-include-2')),
path('app-ns1-0/', include(common_url_patterns, namespace='app-include-1')),
path('app-ns1-1/', include(common_url_patterns, namespace='app-include-2')),
# 'nested' is included twice but namespaced by nested-1 and nested-2.
url(r'^app-ns1-2/', include(nested_url_patterns, namespace='nested-1')),
url(r'^app-ns1-3/', include(nested_url_patterns, namespace='nested-2')),
path('app-ns1-2/', include(nested_url_patterns, namespace='nested-1')),
path('app-ns1-3/', include(nested_url_patterns, namespace='nested-2')),
# namespaced URLs inside non-namespaced URLs.
url(r'^app-ns1-4/', include([url(r'^abc/', include(common_url_patterns))])),
path('app-ns1-4/', include([path('abc/', include(common_url_patterns))])),
]