mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-28 17:09:59 +03:00
used path and re_path for urls
This commit is contained in:
parent
c436b8ab00
commit
0817730c19
|
@ -5,7 +5,6 @@ import os.path
|
|||
import tempfile
|
||||
|
||||
import pytest
|
||||
from django.conf.urls import url
|
||||
from django.contrib.auth import authenticate, login, logout
|
||||
from django.contrib.auth.middleware import AuthenticationMiddleware
|
||||
from django.contrib.auth.models import User
|
||||
|
@ -13,6 +12,8 @@ from django.contrib.sessions.middleware import SessionMiddleware
|
|||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.http.request import RawPostDataException
|
||||
from django.test import TestCase, override_settings
|
||||
from django.conf.urls import path
|
||||
|
||||
|
||||
from rest_framework import status
|
||||
from rest_framework.authentication import SessionAuthentication
|
||||
|
@ -151,9 +152,9 @@ class FileUploadView(APIView):
|
|||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', MockView.as_view()),
|
||||
url(r'^echo/$', EchoView.as_view()),
|
||||
url(r'^upload/$', FileUploadView.as_view())
|
||||
path('', MockView.as_view()),
|
||||
path('echo/', EchoView.as_view()),
|
||||
path('upload/', FileUploadView.as_view())
|
||||
]
|
||||
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
import unittest
|
||||
|
||||
from django.conf.urls import url
|
||||
from django.contrib.auth import authenticate, login
|
||||
from django.contrib.auth.models import User
|
||||
from django.shortcuts import redirect
|
||||
from django.test import override_settings
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.urls import path
|
||||
from django.views.decorators.csrf import csrf_protect, ensure_csrf_cookie
|
||||
|
||||
from rest_framework.compat import requests
|
||||
|
@ -90,10 +90,10 @@ class AuthView(APIView):
|
|||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', Root.as_view(), name='root'),
|
||||
url(r'^headers/$', HeadersView.as_view(), name='headers'),
|
||||
url(r'^session/$', SessionView.as_view(), name='session'),
|
||||
url(r'^auth/$', AuthView.as_view(), name='auth'),
|
||||
path('', Root.as_view(), name='root'),
|
||||
path('headers/', HeadersView.as_view(), name='headers'),
|
||||
path('session/', SessionView.as_view(), name='session'),
|
||||
path('auth/', AuthView.as_view(), name='auth'),
|
||||
]
|
||||
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
from django.conf.urls import include, url
|
||||
from django.test import TestCase, override_settings
|
||||
from django.urls import include, path, re_path
|
||||
|
||||
from rest_framework import generics, routers, serializers, status, viewsets
|
||||
from rest_framework.parsers import JSONParser
|
||||
|
@ -117,15 +117,24 @@ new_model_viewset_router.register(r'', HTMLNewModelViewSet)
|
|||
|
||||
|
||||
urlpatterns = [
|
||||
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'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
|
||||
url(r'^html$', HTMLView.as_view()),
|
||||
url(r'^json$', JSONView.as_view()),
|
||||
url(r'^html1$', HTMLView1.as_view()),
|
||||
url(r'^html_new_model$', HTMLNewModelView.as_view()),
|
||||
url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)),
|
||||
url(r'^restframework', include('rest_framework.urls', namespace='rest_framework'))
|
||||
path(
|
||||
'setbyview/',
|
||||
MockViewSettingContentType.as_view(
|
||||
renderer_classes=[RendererA, RendererB, RendererC])
|
||||
),
|
||||
re_path(
|
||||
r'^.*\.(?P<format>.+)$',
|
||||
MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])
|
||||
),
|
||||
path(
|
||||
'',
|
||||
MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
|
||||
path('html/', HTMLView.as_view()),
|
||||
path('json/', JSONView.as_view()),
|
||||
path('html1/', HTMLView1.as_view()),
|
||||
path('html_new_model/', HTMLNewModelView.as_view()),
|
||||
path('html_new_model_viewset/', include(new_model_viewset_router.urls)),
|
||||
path('restframework/', include('rest_framework.urls', namespace='rest_framework'))
|
||||
]
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
from django.conf.urls import url
|
||||
from django.test import TestCase, override_settings
|
||||
from django.urls import NoReverseMatch
|
||||
from django.urls import path, NoReverseMatch
|
||||
|
||||
from rest_framework.reverse import reverse
|
||||
from rest_framework.test import APIRequestFactory
|
||||
|
@ -13,7 +12,7 @@ def null_view(request):
|
|||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^view$', null_view, name='view'),
|
||||
path('view/', null_view, name='view'),
|
||||
]
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user