summaryrefslogtreecommitdiff
path: root/tests/admin_docs/urls.py
diff options
context:
space:
mode:
authorBouke Haarsma <bouke@webatoom.nl>2013-11-05 10:16:27 +0100
committerClaude Paroz <claude@2xlibre.net>2013-12-18 19:44:04 +0100
commita39d672ec7d53637805a61b45a51bc0e7d297a36 (patch)
treea8d9d2e2ff79822a3fbeb01a7974ef0669912ce2 /tests/admin_docs/urls.py
parentf1b3ab9c2158f5a7da113aef4158499ce2d42ee2 (diff)
Fixed #21386 -- Removed admindocs dependence on sites framework
* Removed ADMIN_FOR setting and warn warning * Group view functions by namespace instead of site * Added a test verifying namespaces are listed Thanks to Claude Paroz for reviewing and ideas for improvement.
Diffstat (limited to 'tests/admin_docs/urls.py')
-rw-r--r--tests/admin_docs/urls.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/admin_docs/urls.py b/tests/admin_docs/urls.py
index 2dcd0315be..48e7898d09 100644
--- a/tests/admin_docs/urls.py
+++ b/tests/admin_docs/urls.py
@@ -1,11 +1,16 @@
-from django.conf.urls import include, patterns
+from django.conf.urls import include, patterns, url
from django.contrib import admin
from . import views
+ns_patterns = patterns('',
+ url(r'^xview/func/$', views.xview_dec(views.xview), name='func'),
+)
+
urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
(r'^admindocs/', include('django.contrib.admindocs.urls')),
+ (r'^', include(ns_patterns, namespace='test')),
(r'^xview/func/$', views.xview_dec(views.xview)),
(r'^xview/class/$', views.xview_dec(views.XViewClass.as_view())),
)