encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-01-23 15:54:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove django.conf.urls.pattern as it'll be removed in Django 2.0

Browse Source
This commit is contained in:
Xavier Ordoquy 2015-06-11 00:45:23 +02:00
parent ca0a7ee1de
commit 1e51230f1b
16 changed files with 49 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/routers.py
View File

@ -17,7 +17,7 @@ from __future__ import unicode_literals
import itertools import itertools
from collections import namedtuple from collections import namedtuple
from django.conf.urls import patterns, url from django.conf.urls import url
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import NoReverseMatch from django.core.urlresolvers import NoReverseMatch
from rest_framework import views from rest_framework import views
@ -76,7 +76,7 @@ class BaseRouter(object):
@property @property
def urls(self): def urls(self):
if not hasattr(self, '_urls'): if not hasattr(self, '_urls'):
self._urls = patterns('', *self.get_urls()) self._urls = self.get_urls()
return self._urls return self._urls

13
rest_framework/urls.py
View File

@ -4,23 +4,22 @@ Login and logout views for the browsable API.
Add these to your root URLconf if you're using the browsable API and Add these to your root URLconf if you're using the browsable API and
your API requires authentication: your API requires authentication:
urlpatterns = patterns('', urlpatterns = [
... ...
url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')) url(r'^auth/', include('rest_framework.urls', namespace='rest_framework'))
) ]
The urls must be namespaced as 'rest_framework', and you should make sure The urls must be namespaced as 'rest_framework', and you should make sure
your authentication settings include `SessionAuthentication`. your authentication settings include `SessionAuthentication`.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns, url from django.conf.urls import url
from django.contrib.auth import views from django.contrib.auth import views
template_name = {'template_name': 'rest_framework/login.html'} template_name = {'template_name': 'rest_framework/login.html'}
urlpatterns = patterns( urlpatterns = [
'',
url(r'^login/$', views.login, template_name, name='login'), url(r'^login/$', views.login, template_name, name='login'),
url(r'^logout/$', views.logout, template_name, name='logout') url(r'^logout/$', views.logout, template_name, name='logout'),
) ]

7
tests/browsable_api/auth_urls.py
View File

@ -1,11 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns, url, include from django.conf.urls import url, include
from .views import MockView from .views import MockView
urlpatterns = patterns( urlpatterns = [
'',
(r'^$', MockView.as_view()), (r'^$', MockView.as_view()),
url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')),
) ]

6
tests/browsable_api/no_auth_urls.py
View File

@ -1,9 +1,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns
from .views import MockView from .views import MockView
urlpatterns = patterns( urlpatterns = [
'',
(r'^$', MockView.as_view()), (r'^$', MockView.as_view()),
) ]

7
tests/test_authentication.py
View File

@ -1,5 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns, url, include from django.conf.urls import url, include
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.http import HttpResponse from django.http import HttpResponse
from django.test import TestCase from django.test import TestCase
@ -37,14 +37,13 @@ class MockView(APIView):
return HttpResponse({'a': 1, 'b': 2, 'c': 3}) return HttpResponse({'a': 1, 'b': 2, 'c': 3})
urlpatterns = patterns( urlpatterns = [
'',
(r'^session/$', MockView.as_view(authentication_classes=[SessionAuthentication])), (r'^session/$', MockView.as_view(authentication_classes=[SessionAuthentication])),
(r'^basic/$', MockView.as_view(authentication_classes=[BasicAuthentication])), (r'^basic/$', MockView.as_view(authentication_classes=[BasicAuthentication])),
(r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])), (r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])),
(r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'), (r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'),
url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')) url(r'^auth/', include('rest_framework.urls', namespace='rest_framework'))
) ]
class BasicAuthTests(TestCase): class BasicAuthTests(TestCase):

7
tests/test_filters.py
View File

@ -2,7 +2,7 @@ from __future__ import unicode_literals
import datetime import datetime
from decimal import Decimal from decimal import Decimal
from django.db import models from django.db import models
from django.conf.urls import patterns, url from django.conf.urls import url
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.test import TestCase from django.test import TestCase
from django.test.utils import override_settings from django.test.utils import override_settings
@ -94,13 +94,12 @@ if django_filters:
def get_queryset(self): def get_queryset(self):
return FilterableItem.objects.all() return FilterableItem.objects.all()
urlpatterns = patterns( urlpatterns = [
'',
url(r'^(?P<pk>\d+)/$', FilterClassDetailView.as_view(), name='detail-view'), url(r'^(?P<pk>\d+)/$', FilterClassDetailView.as_view(), name='detail-view'),
url(r'^$', FilterClassRootView.as_view(), name='root-view'), url(r'^$', FilterClassRootView.as_view(), name='root-view'),
url(r'^get-queryset/$', GetQuerysetView.as_view(), url(r'^get-queryset/$', GetQuerysetView.as_view(),
name='get-queryset-view'), name='get-queryset-view'),
) ]
class CommonFilteringTestCase(TestCase): class CommonFilteringTestCase(TestCase):

7
tests/test_htmlrenderer.py
View File

@ -1,6 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.conf.urls import patterns, url from django.conf.urls import url
from django.http import Http404 from django.http import Http404
from django.test import TestCase from django.test import TestCase
from django.template import TemplateDoesNotExist, Template from django.template import TemplateDoesNotExist, Template
@ -34,12 +34,11 @@ def not_found(request):
raise Http404() raise Http404()
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', example), url(r'^$', example),
url(r'^permission_denied$', permission_denied), url(r'^permission_denied$', permission_denied),
url(r'^not_found$', not_found), url(r'^not_found$', not_found),
) ]
class TemplateHTMLRendererTests(TestCase): class TemplateHTMLRendererTests(TestCase):

7
tests/test_middleware.py
View File

@ -1,5 +1,5 @@
from django.conf.urls import patterns, url from django.conf.urls import url
from django.contrib.auth.models import User from django.contrib.auth.models import User
from rest_framework.authentication import TokenAuthentication from rest_framework.authentication import TokenAuthentication
from rest_framework.authtoken.models import Token from rest_framework.authtoken.models import Token
@ -7,10 +7,9 @@ from rest_framework.test import APITestCase
from rest_framework.views import APIView from rest_framework.views import APIView
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', APIView.as_view(authentication_classes=(TokenAuthentication,))), url(r'^$', APIView.as_view(authentication_classes=(TokenAuthentication,))),
) ]
class MyMiddleware(object): class MyMiddleware(object):

5
tests/test_renderers.py
View File

@ -103,8 +103,7 @@ class HTMLView1(APIView):
def get(self, request, **kwargs): def get(self, request, **kwargs):
return Response('text') return Response('text')
urlpatterns = patterns( urlpatterns = [
'',
url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])), url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])), url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
url(r'^cache$', MockGETView.as_view()), url(r'^cache$', MockGETView.as_view()),
@ -113,7 +112,7 @@ urlpatterns = patterns(
url(r'^html1$', HTMLView1.as_view()), url(r'^html1$', HTMLView1.as_view()),
url(r'^empty$', EmptyGETView.as_view()), url(r'^empty$', EmptyGETView.as_view()),
url(r'^api', include('rest_framework.urls', namespace='rest_framework')) url(r'^api', include('rest_framework.urls', namespace='rest_framework'))
) ]
class POSTDeniedPermission(permissions.BasePermission): class POSTDeniedPermission(permissions.BasePermission):

6
tests/test_request.py
View File

@ -2,7 +2,6 @@
Tests for content parsing, and form-overloaded content parsing. Tests for content parsing, and form-overloaded content parsing.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth import authenticate, login, logout from django.contrib.auth import authenticate, login, logout
from django.contrib.sessions.middleware import SessionMiddleware from django.contrib.sessions.middleware import SessionMiddleware
@ -189,10 +188,9 @@ class MockView(APIView):
return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR) return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR)
urlpatterns = patterns( urlpatterns = [
'',
(r'^$', MockView.as_view()), (r'^$', MockView.as_view()),
) ]
class TestContentParsingWithAuthentication(TestCase): class TestContentParsingWithAuthentication(TestCase):

7
tests/test_response.py
View File

@ -1,5 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns, url, include from django.conf.urls import url, include
from django.test import TestCase from django.test import TestCase
from django.utils import six from django.utils import six
from tests.models import BasicModel from tests.models import BasicModel
@ -113,8 +113,7 @@ new_model_viewset_router = routers.DefaultRouter()
new_model_viewset_router.register(r'', HTMLNewModelViewSet) new_model_viewset_router.register(r'', HTMLNewModelViewSet)
urlpatterns = patterns( urlpatterns = [
'',
url(r'^setbyview$', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])), url(r'^setbyview$', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
@ -123,7 +122,7 @@ urlpatterns = patterns(
url(r'^html_new_model$', HTMLNewModelView.as_view()), url(r'^html_new_model$', HTMLNewModelView.as_view()),
url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)), url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)),
url(r'^restframework', include('rest_framework.urls', namespace='rest_framework')) url(r'^restframework', include('rest_framework.urls', namespace='rest_framework'))
) ]
# TODO: Clean tests bellow - remove duplicates with above, better unit testing, ... # TODO: Clean tests bellow - remove duplicates with above, better unit testing, ...

7
tests/test_reverse.py
View File

@ -1,5 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf.urls import patterns, url from django.conf.urls import url
from django.core.urlresolvers import NoReverseMatch from django.core.urlresolvers import NoReverseMatch
from django.test import TestCase from django.test import TestCase
from rest_framework.reverse import reverse from rest_framework.reverse import reverse
@ -11,10 +11,9 @@ factory = APIRequestFactory()
def null_view(request): def null_view(request):
pass pass
urlpatterns = patterns( urlpatterns = [
'',
url(r'^view$', null_view, name='view'), url(r'^view$', null_view, name='view'),
) ]
class MockVersioningScheme(object): class MockVersioningScheme(object):

5
tests/test_testing.py
View File

@ -32,12 +32,11 @@ def redirect_view(request):
return redirect('/view/') return redirect('/view/')
urlpatterns = patterns( urlpatterns = [
'',
url(r'^view/$', view), url(r'^view/$', view),
url(r'^session-view/$', session_view), url(r'^session-view/$', session_view),
url(r'^redirect-view/$', redirect_view), url(r'^redirect-view/$', redirect_view),
) ]
class TestAPITestClient(TestCase): class TestAPITestClient(TestCase):

22
tests/test_urlpatterns.py
View File

@ -1,6 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from collections import namedtuple from collections import namedtuple
from django.conf.urls import patterns, url, include from django.conf.urls import url, include
from django.core import urlresolvers from django.core import urlresolvers
from django.test import TestCase from django.test import TestCase
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory
@ -36,10 +36,9 @@ class FormatSuffixTests(TestCase):
self.assertEqual(callback_kwargs, test_path.kwargs) self.assertEqual(callback_kwargs, test_path.kwargs)
def test_format_suffix(self): def test_format_suffix(self):
urlpatterns = patterns( urlpatterns = [
'',
url(r'^test$', dummy_view), url(r'^test$', dummy_view),
) ]
test_paths = [ test_paths = [
URLTestPath('/test', (), {}), URLTestPath('/test', (), {}),
URLTestPath('/test.api', (), {'format': 'api'}), URLTestPath('/test.api', (), {'format': 'api'}),
@ -48,10 +47,9 @@ class FormatSuffixTests(TestCase):
self._resolve_urlpatterns(urlpatterns, test_paths) self._resolve_urlpatterns(urlpatterns, test_paths)
def test_default_args(self): def test_default_args(self):
urlpatterns = patterns( urlpatterns = [
'',
url(r'^test$', dummy_view, {'foo': 'bar'}), url(r'^test$', dummy_view, {'foo': 'bar'}),
) ]
test_paths = [ test_paths = [
URLTestPath('/test', (), {'foo': 'bar', }), URLTestPath('/test', (), {'foo': 'bar', }),
URLTestPath('/test.api', (), {'foo': 'bar', 'format': 'api'}), URLTestPath('/test.api', (), {'foo': 'bar', 'format': 'api'}),
@ -60,14 +58,12 @@ class FormatSuffixTests(TestCase):
self._resolve_urlpatterns(urlpatterns, test_paths) self._resolve_urlpatterns(urlpatterns, test_paths)
def test_included_urls(self): def test_included_urls(self):
nested_patterns = patterns( nested_patterns = [
'',
url(r'^path$', dummy_view) url(r'^path$', dummy_view)
) ]
urlpatterns = patterns( urlpatterns = [
'',
url(r'^test/', include(nested_patterns), {'foo': 'bar'}), url(r'^test/', include(nested_patterns), {'foo': 'bar'}),
) ]
test_paths = [ test_paths = [
URLTestPath('/test/path', (), {'foo': 'bar', }), URLTestPath('/test/path', (), {'foo': 'bar', }),
URLTestPath('/test/path.api', (), {'foo': 'bar', 'format': 'api'}), URLTestPath('/test/path.api', (), {'foo': 'bar', 'format': 'api'}),

5
tests/test_utils.py
View File

@ -31,14 +31,13 @@ class NestedResourceInstance(APIView):
pass pass
urlpatterns = patterns( urlpatterns = [
'',
url(r'^$', Root.as_view()), url(r'^$', Root.as_view()),
url(r'^resource/$', ResourceRoot.as_view()), url(r'^resource/$', ResourceRoot.as_view()),
url(r'^resource/(?P<key>[0-9]+)$', ResourceInstance.as_view()), url(r'^resource/(?P<key>[0-9]+)$', ResourceInstance.as_view()),
url(r'^resource/(?P<key>[0-9]+)/$', NestedResourceRoot.as_view()), url(r'^resource/(?P<key>[0-9]+)/$', NestedResourceRoot.as_view()),
url(r'^resource/(?P<key>[0-9]+)/(?P<other>[A-Za-z]+)$', NestedResourceInstance.as_view()), url(r'^resource/(?P<key>[0-9]+)/(?P<other>[A-Za-z]+)$', NestedResourceInstance.as_view()),
) ]
class BreadcrumbTests(TestCase): class BreadcrumbTests(TestCase):

4
tests/urls.py
View File

@ -1,6 +1,4 @@
""" """
Blank URLConf just to keep the test suite happy Blank URLConf just to keep the test suite happy
""" """
from django.conf.urls import patterns urlpatterns = []
urlpatterns = patterns('')