From 743c6131aa4212598e3d04272381a0e5fb387aa1 Mon Sep 17 00:00:00 2001 From: sol HYUN Date: Fri, 24 Mar 2017 16:59:19 +0900 Subject: [PATCH] clean up --- rest_framework/schemas.py | 3 +-- tests/test_atomic_requests.py | 1 + tests/test_permissions.py | 3 +++ tests/test_renderers.py | 1 + tests/test_request.py | 1 + tests/test_response.py | 1 + tests/test_reverse.py | 1 + tests/test_schemas.py | 1 + tests/test_validation.py | 1 + 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 65b10588e..78689c986 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -338,8 +338,7 @@ class SchemaGenerator(object): """ Removes '/' from path and returns a linked value using '-'. """ - ret = [ partial for partial in path.split('/') - if partial and '{' not in partial ] + ret = [partial for partial in path.split('/') if partial and '{' not in partial] return '-'.join(ret) def create_view(self, callback, method, request=None): diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 9085bfc89..f925ce3d3 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -45,6 +45,7 @@ class NonAtomicAPIExceptionView(APIView): BasicModel.objects.all() raise Http404 + urlpatterns = ( url(r'^$', NonAtomicAPIExceptionView.as_view()), ) diff --git a/tests/test_permissions.py b/tests/test_permissions.py index cabf66883..6fbf766a0 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -246,6 +246,7 @@ class ObjectPermissionInstanceView(generics.RetrieveUpdateDestroyAPIView): authentication_classes = [authentication.BasicAuthentication] permission_classes = [ViewObjectPermissions] + object_permissions_view = ObjectPermissionInstanceView.as_view() @@ -255,6 +256,7 @@ class ObjectPermissionListView(generics.ListAPIView): authentication_classes = [authentication.BasicAuthentication] permission_classes = [ViewObjectPermissions] + object_permissions_list_view = ObjectPermissionListView.as_view() @@ -443,6 +445,7 @@ class DeniedObjectView(PermissionInstanceView): class DeniedObjectViewWithDetail(PermissionInstanceView): permission_classes = (BasicObjectPermWithDetail,) + denied_view = DeniedView.as_view() denied_view_with_detail = DeniedViewWithDetail.as_view() diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 12ac2dfc8..dd52b39e5 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -108,6 +108,7 @@ class HTMLView1(APIView): def get(self, request, **kwargs): return Response('text') + urlpatterns = [ url(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])), url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])), diff --git a/tests/test_request.py b/tests/test_request.py index 428b969f5..2cf9320ea 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -120,6 +120,7 @@ class MockView(APIView): return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR) + urlpatterns = [ url(r'^$', MockView.as_view()), ] diff --git a/tests/test_response.py b/tests/test_response.py index 33c51e773..e92bf54c1 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -32,6 +32,7 @@ class MockJsonRenderer(BaseRenderer): class MockTextMediaRenderer(BaseRenderer): media_type = 'text/html' + DUMMYSTATUS = status.HTTP_200_OK DUMMYCONTENT = 'dummycontent' diff --git a/tests/test_reverse.py b/tests/test_reverse.py index 2ca44ab77..47eda256e 100644 --- a/tests/test_reverse.py +++ b/tests/test_reverse.py @@ -13,6 +13,7 @@ factory = APIRequestFactory() def null_view(request): pass + urlpatterns = [ url(r'^view$', null_view, name='view'), ] diff --git a/tests/test_schemas.py b/tests/test_schemas.py index b1b87b8dc..c026289e6 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -70,6 +70,7 @@ class ExampleViewSet(ModelViewSet): assert self.action return super(ExampleViewSet, self).get_serializer(*args, **kwargs) + if coreapi: schema_view = get_schema_view(title='Example API') else: diff --git a/tests/test_validation.py b/tests/test_validation.py index 8ff4aaf38..8b71693c5 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -243,6 +243,7 @@ class RegexSerializer(serializers.Serializer): validators=[RegexValidator(regex=re.compile('^[0-9]{4,6}$'), message='A PIN is 4-6 digits')]) + expected_repr = """ RegexSerializer(): pin = CharField(validators=[])