summaryrefslogtreecommitdiff
path: root/tests/admin_docs
diff options
context:
space:
mode:
authorMarten Kenbeek <marten.knbk@gmail.com>2015-05-28 17:25:52 +0200
committerTim Graham <timograham@gmail.com>2015-06-08 15:12:20 -0400
commit1e82094f1b6690018228e688303295f83e1c3d9a (patch)
treea0e209da939ebe3b64e8e38cf47a191785825da0 /tests/admin_docs
parent39937de7e60052d3ffa9f07fdbb9262aced35d61 (diff)
Fixed #21927 -- Made application and instance namespaces more distinct.
Made URL application namespaces be set in the included URLconf and instance namespaces in the call to include(). Deprecated other ways to set application and instance namespaces.
Diffstat (limited to 'tests/admin_docs')
-rw-r--r--tests/admin_docs/urls.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/admin_docs/urls.py b/tests/admin_docs/urls.py
index 3fbfaff0c4..0bcdee4b4b 100644
--- a/tests/admin_docs/urls.py
+++ b/tests/admin_docs/urls.py
@@ -3,12 +3,12 @@ from django.contrib import admin
from . import views
-ns_patterns = [
+ns_patterns = ([
url(r'^xview/func/$', views.xview_dec(views.xview), name='func'),
-]
+], 'test')
urlpatterns = [
- url(r'^admin/', include(admin.site.urls)),
+ url(r'^admin/', admin.site.urls),
url(r'^admindocs/', include('django.contrib.admindocs.urls')),
url(r'^', include(ns_patterns, namespace='test')),
url(r'^xview/func/$', views.xview_dec(views.xview)),