diff options
| author | Tim Graham <timograham@gmail.com> | 2017-01-10 09:57:49 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-01-17 20:52:00 -0500 |
| commit | ad393beeb71e8774e4bf9ad842b97022e50f1231 (patch) | |
| tree | 7ae0a539e53c582865a57273d902b3f29192d699 /tests/urlpatterns_reverse/namespace_urls.py | |
| parent | c6de8cca208fb471723619970c09ecb3bd335362 (diff) | |
Refs #21927 -- Removed include()'s app_name argument per deprecation timeline.
Also removed support for passing a 3-tuple to include() and support for
setting an instance namespace without an application namespace.
Thanks Marten Kenbeek for completing the patch.
Diffstat (limited to 'tests/urlpatterns_reverse/namespace_urls.py')
| -rw-r--r-- | tests/urlpatterns_reverse/namespace_urls.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py index fa6359dec2..a92df2716a 100644 --- a/tests/urlpatterns_reverse/namespace_urls.py +++ b/tests/urlpatterns_reverse/namespace_urls.py @@ -12,6 +12,7 @@ otherobj2 = URLObject('nodefault', 'other-ns2') newappobj1 = URLObject('newapp') +app_name = 'namespace_urls' urlpatterns = [ url(r'^normal/$', views.empty_view, name='normal-view'), url(r'^normal/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view, name='normal-view'), @@ -27,12 +28,12 @@ urlpatterns = [ url(r'^unnamed/normal/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.empty_view), url(r'^unnamed/view_class/(?P<arg1>[0-9]+)/(?P<arg2>[0-9]+)/$', views.view_class_instance), - url(r'^test1/', include(testobj1.urls)), - url(r'^test2/', include(testobj2.urls)), - url(r'^default/', include(default_testobj.urls)), + url(r'^test1/', include(*testobj1.urls)), + url(r'^test2/', include(*testobj2.urls)), + url(r'^default/', include(*default_testobj.urls)), - url(r'^other1/', include(otherobj1.urls)), - url(r'^other[246]/', include(otherobj2.urls)), + url(r'^other1/', include(*otherobj1.urls)), + url(r'^other[246]/', include(*otherobj2.urls)), url(r'^newapp1/', include(newappobj1.app_urls, 'new-ns1')), url(r'^new-default/', include(newappobj1.app_urls)), @@ -43,10 +44,12 @@ urlpatterns = [ url(r'^ns-included[135]/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')), url(r'^ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')), - url(r'^app-included/', include('urlpatterns_reverse.included_namespace_urls', 'inc-app', 'inc-app')), + url(r'^app-included/', include('urlpatterns_reverse.included_namespace_urls', 'inc-app')), url(r'^included/', include('urlpatterns_reverse.included_namespace_urls')), - url(r'^inc(?P<outer>[0-9]+)/', include('urlpatterns_reverse.included_urls', namespace='inc-ns5')), + url( + r'^inc(?P<outer>[0-9]+)/', include(('urlpatterns_reverse.included_urls', 'included_urls'), namespace='inc-ns5') + ), url(r'^included/([0-9]+)/', include('urlpatterns_reverse.included_namespace_urls')), url( |