test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #27887 -- Fixed URLs check crash with namespaced URLs inside non-namespaced URLs.

This commit is contained in:
Tim Graham 2017-03-03 10:52:20 -05:00 committed by GitHub
parent 6b47431aaf
commit b23d264046
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/core/checks/urls.py
View File

@ -60,7 +60,10 @@ def _load_all_namespaces(resolver, parents=()):
if getattr(url, 'namespace', None) is not None if getattr(url, 'namespace', None) is not None
] ]
for pattern in url_patterns: for pattern in url_patterns:
current = parents + (getattr(pattern, 'namespace', ()),) namespace = getattr(pattern, 'namespace', None)
current = parents
if namespace is not None:
current += (namespace,)
namespaces.extend(_load_all_namespaces(pattern, current)) namespaces.extend(_load_all_namespaces(pattern, current))
return namespaces return namespaces

2
tests/check_framework/urls/unique_namespaces.py
View File

@ -15,4 +15,6 @@ urlpatterns = [
# 'nested' is included twice but namespaced by nested-1 and nested-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-2/', include(nested_url_patterns, namespace='nested-1')),
url(r'^app-ns1-3/', include(nested_url_patterns, namespace='nested-2')), url(r'^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))])),
] ]