From 7ff344bf8b4943c0bb2309a4aa01be146f21bc29 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Mon, 16 Oct 2017 09:58:25 +0200 Subject: [PATCH] Update remaing `include` calls Missed as part of #5481 cleanup. --- tests/test_routers.py | 2 +- tests/test_versioning.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_routers.py b/tests/test_routers.py index 46d54ed9f3..39c5317d6d 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -97,7 +97,7 @@ def regex_url_path_detail(self, request, *args, **kwargs): urlpatterns = [ url(r'^non-namespaced/', include(namespaced_router.urls)), - url(r'^namespaced/', include(namespaced_router.urls, namespace='example', app_name='example')), + url(r'^namespaced/', include((namespaced_router.urls, 'example'), namespace='example')), url(r'^example/', include(notes_router.urls)), url(r'^example2/', include(kwarged_notes_router.urls)), diff --git a/tests/test_versioning.py b/tests/test_versioning.py index ab64dfab7f..e73059c7d7 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -170,7 +170,7 @@ class TestURLReversing(URLPatternsTestCase): ] urlpatterns = [ - url(r'^v1/', include(included, namespace='v1', app_name='v1')), + url(r'^v1/', include((included, 'v1'), namespace='v1')), url(r'^another/$', dummy_view, name='another'), url(r'^(?P[v1|v2]+)/another/$', dummy_view, name='another'), ] @@ -335,8 +335,8 @@ class TestHyperlinkedRelatedField(URLPatternsTestCase): ] urlpatterns = [ - url(r'^v1/', include(included, namespace='v1', app_name='v1')), - url(r'^v2/', include(included, namespace='v2', app_name='v2')) + url(r'^v1/', include((included, 'v1'), namespace='v1')), + url(r'^v2/', include((included, 'v2'), namespace='v2')) ] def setUp(self): @@ -367,12 +367,12 @@ class TestNamespaceVersioningHyperlinkedRelatedFieldScheme(URLPatternsTestCase): ] included = [ url(r'^namespaced/(?P\d+)/$', dummy_pk_view, name='namespaced'), - url(r'^nested/', include(nested, namespace='nested-namespace', app_name='nested-namespace')) + url(r'^nested/', include((nested, 'nested-namespace'), namespace='nested-namespace')) ] urlpatterns = [ - url(r'^v1/', include(included, namespace='v1', app_name='restframeworkv1')), - url(r'^v2/', include(included, namespace='v2', app_name='restframeworkv2')), + url(r'^v1/', include((included, 'restframeworkv1'), namespace='v1')), + url(r'^v2/', include((included, 'restframeworkv2'), namespace='v2')), url(r'^non-api/(?P\d+)/$', dummy_pk_view, name='non-api-view') ]