mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-08-05 04:50:12 +03:00
clean up
This commit is contained in:
parent
94808d7eb2
commit
743c6131aa
|
@ -338,8 +338,7 @@ class SchemaGenerator(object):
|
||||||
"""
|
"""
|
||||||
Removes '/' from path and returns a linked value using '-'.
|
Removes '/' from path and returns a linked value using '-'.
|
||||||
"""
|
"""
|
||||||
ret = [ partial for partial in path.split('/')
|
ret = [partial for partial in path.split('/') if partial and '{' not in partial]
|
||||||
if partial and '{' not in partial ]
|
|
||||||
return '-'.join(ret)
|
return '-'.join(ret)
|
||||||
|
|
||||||
def create_view(self, callback, method, request=None):
|
def create_view(self, callback, method, request=None):
|
||||||
|
|
|
@ -45,6 +45,7 @@ class NonAtomicAPIExceptionView(APIView):
|
||||||
BasicModel.objects.all()
|
BasicModel.objects.all()
|
||||||
raise Http404
|
raise Http404
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = (
|
urlpatterns = (
|
||||||
url(r'^$', NonAtomicAPIExceptionView.as_view()),
|
url(r'^$', NonAtomicAPIExceptionView.as_view()),
|
||||||
)
|
)
|
||||||
|
|
|
@ -246,6 +246,7 @@ class ObjectPermissionInstanceView(generics.RetrieveUpdateDestroyAPIView):
|
||||||
authentication_classes = [authentication.BasicAuthentication]
|
authentication_classes = [authentication.BasicAuthentication]
|
||||||
permission_classes = [ViewObjectPermissions]
|
permission_classes = [ViewObjectPermissions]
|
||||||
|
|
||||||
|
|
||||||
object_permissions_view = ObjectPermissionInstanceView.as_view()
|
object_permissions_view = ObjectPermissionInstanceView.as_view()
|
||||||
|
|
||||||
|
|
||||||
|
@ -255,6 +256,7 @@ class ObjectPermissionListView(generics.ListAPIView):
|
||||||
authentication_classes = [authentication.BasicAuthentication]
|
authentication_classes = [authentication.BasicAuthentication]
|
||||||
permission_classes = [ViewObjectPermissions]
|
permission_classes = [ViewObjectPermissions]
|
||||||
|
|
||||||
|
|
||||||
object_permissions_list_view = ObjectPermissionListView.as_view()
|
object_permissions_list_view = ObjectPermissionListView.as_view()
|
||||||
|
|
||||||
|
|
||||||
|
@ -443,6 +445,7 @@ class DeniedObjectView(PermissionInstanceView):
|
||||||
class DeniedObjectViewWithDetail(PermissionInstanceView):
|
class DeniedObjectViewWithDetail(PermissionInstanceView):
|
||||||
permission_classes = (BasicObjectPermWithDetail,)
|
permission_classes = (BasicObjectPermWithDetail,)
|
||||||
|
|
||||||
|
|
||||||
denied_view = DeniedView.as_view()
|
denied_view = DeniedView.as_view()
|
||||||
|
|
||||||
denied_view_with_detail = DeniedViewWithDetail.as_view()
|
denied_view_with_detail = DeniedViewWithDetail.as_view()
|
||||||
|
|
|
@ -108,6 +108,7 @@ class HTMLView1(APIView):
|
||||||
def get(self, request, **kwargs):
|
def get(self, request, **kwargs):
|
||||||
return Response('text')
|
return Response('text')
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
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])),
|
||||||
|
|
|
@ -120,6 +120,7 @@ class MockView(APIView):
|
||||||
|
|
||||||
return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR)
|
return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR)
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$', MockView.as_view()),
|
url(r'^$', MockView.as_view()),
|
||||||
]
|
]
|
||||||
|
|
|
@ -32,6 +32,7 @@ class MockJsonRenderer(BaseRenderer):
|
||||||
class MockTextMediaRenderer(BaseRenderer):
|
class MockTextMediaRenderer(BaseRenderer):
|
||||||
media_type = 'text/html'
|
media_type = 'text/html'
|
||||||
|
|
||||||
|
|
||||||
DUMMYSTATUS = status.HTTP_200_OK
|
DUMMYSTATUS = status.HTTP_200_OK
|
||||||
DUMMYCONTENT = 'dummycontent'
|
DUMMYCONTENT = 'dummycontent'
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ factory = APIRequestFactory()
|
||||||
def null_view(request):
|
def null_view(request):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^view$', null_view, name='view'),
|
url(r'^view$', null_view, name='view'),
|
||||||
]
|
]
|
||||||
|
|
|
@ -70,6 +70,7 @@ class ExampleViewSet(ModelViewSet):
|
||||||
assert self.action
|
assert self.action
|
||||||
return super(ExampleViewSet, self).get_serializer(*args, **kwargs)
|
return super(ExampleViewSet, self).get_serializer(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
if coreapi:
|
if coreapi:
|
||||||
schema_view = get_schema_view(title='Example API')
|
schema_view = get_schema_view(title='Example API')
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -243,6 +243,7 @@ class RegexSerializer(serializers.Serializer):
|
||||||
validators=[RegexValidator(regex=re.compile('^[0-9]{4,6}$'),
|
validators=[RegexValidator(regex=re.compile('^[0-9]{4,6}$'),
|
||||||
message='A PIN is 4-6 digits')])
|
message='A PIN is 4-6 digits')])
|
||||||
|
|
||||||
|
|
||||||
expected_repr = """
|
expected_repr = """
|
||||||
RegexSerializer():
|
RegexSerializer():
|
||||||
pin = CharField(validators=[<django.core.validators.RegexValidator object>])
|
pin = CharField(validators=[<django.core.validators.RegexValidator object>])
|
||||||
|
|
Loading…
Reference in New Issue
Block a user