summaryrefslogtreecommitdiff
path: root/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-08-05 07:09:47 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-08-05 07:09:47 +0000
commite0fb90b2f3b16300426851790b0ef3e50f3d67b3 (patch)
tree7060bed0930bd6253c3470b9abb8c697250f1a2f /tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
parentaa93f8c2f0ff5f568d3f73e49b3b217b5ba3c0b8 (diff)
Fixed #13922 -- Updated resolve() to support namespaces. Thanks to Nowell Strite for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py')
-rw-r--r--tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
index 073190657c..5dc302c862 100644
--- a/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
@@ -7,7 +7,11 @@ urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
url(r'^normal/$', 'empty_view', name='inc-normal-view'),
url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'),
+ url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-mixed-args'),
+ url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='inc-no-kwargs'),
+
(r'^test3/', include(testobj3.urls)),
(r'^ns-included3/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns3')),
+ (r'^ns-included4/', include('regressiontests.urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
)