encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update remaing include calls

Browse Source 
Missed as part of #5481 cleanup.
This commit is contained in:
Carlton Gibson 2017-10-16 09:58:25 +02:00
parent cbfa444454
commit 7ff344bf8b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_routers.py
View File

@ -97,7 +97,7 @@ regex_url_path_router.register(r'', RegexUrlPathViewSet, base_name='regex')
urlpatterns = [ urlpatterns = [
url(r'^non-namespaced/', include(namespaced_router.urls)), 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'^example/', include(notes_router.urls)),
url(r'^example2/', include(kwarged_notes_router.urls)), url(r'^example2/', include(kwarged_notes_router.urls)),

12
tests/test_versioning.py
View File

@ -170,7 +170,7 @@ class TestURLReversing(URLPatternsTestCase):
] ]
urlpatterns = [ 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'^another/$', dummy_view, name='another'),
url(r'^(?P<version>[v1|v2]+)/another/$', dummy_view, name='another'), url(r'^(?P<version>[v1|v2]+)/another/$', dummy_view, name='another'),
] ]
@ -335,8 +335,8 @@ class TestHyperlinkedRelatedField(URLPatternsTestCase):
] ]
urlpatterns = [ urlpatterns = [
url(r'^v1/', include(included, namespace='v1', app_name='v1')), url(r'^v1/', include((included, 'v1'), namespace='v1')),
url(r'^v2/', include(included, namespace='v2', app_name='v2')) url(r'^v2/', include((included, 'v2'), namespace='v2'))
] ]
def setUp(self): def setUp(self):
@ -367,12 +367,12 @@ class TestNamespaceVersioningHyperlinkedRelatedFieldScheme(URLPatternsTestCase):
] ]
included = [ included = [
url(r'^namespaced/(?P<pk>\d+)/$', dummy_pk_view, name='namespaced'), url(r'^namespaced/(?P<pk>\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 = [ urlpatterns = [
url(r'^v1/', include(included, namespace='v1', app_name='restframeworkv1')), url(r'^v1/', include((included, 'restframeworkv1'), namespace='v1')),
url(r'^v2/', include(included, namespace='v2', app_name='restframeworkv2')), url(r'^v2/', include((included, 'restframeworkv2'), namespace='v2')),
url(r'^non-api/(?P<pk>\d+)/$', dummy_pk_view, name='non-api-view') url(r'^non-api/(?P<pk>\d+)/$', dummy_pk_view, name='non-api-view')
] ]