In urlconfs, include() may now be used on an iterable of patterns instead of just a module string. Refs #6470 -- making the admin use a urlconf is much easier with this work done. Thanks, Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9728 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 9 insertions, 0 deletions

diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
index 379197085a..aecfdfc6c5 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/regressiontests/urlpatterns_reverse/tests.py
@@ -81,6 +81,7 @@ test_data = (
     ('kwargs_view', '/arg_view/10/', [], {'arg1':10}),
     ('regressiontests.urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/', [], {}),
     ('regressiontests.urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/10/', [], {'arg1':10}),
+    ('non_path_include', '/includes/non_path_include/', [], {})
 
 )
 
diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py
index b3aed4f22d..c603c0235a 100644
--- a/tests/regressiontests/urlpatterns_reverse/urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/urls.py
@@ -1,6 +1,10 @@
 from django.conf.urls.defaults import *
 from views import empty_view, absolute_kwargs_view
 
+other_patterns = patterns('',
+    url(r'non_path_include/$', empty_view, name='non_path_include'),
+)
+
 urlpatterns = patterns('',
     url(r'^places/(\d+)/$', empty_view, name='places'),
     url(r'^places?/$', empty_view, name="places?"),
@@ -51,5 +55,9 @@ urlpatterns = patterns('',
     url(r'arg_view/(?P<arg1>\d+)/$', 'kwargs_view'),
     url(r'absolute_arg_view/(?P<arg1>\d+)/$', absolute_kwargs_view),
     url(r'absolute_arg_view/$', absolute_kwargs_view),
+    
+    url('^includes/', include(other_patterns)),
 
 )
+
+