encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-28 00:49:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed tests and code linting

Browse Source
This commit is contained in:
peppelinux 2020-08-05 10:32:17 +02:00
parent d0ef9d4660
commit 7aeadd5f90
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/management/commands/generateschema.py
View File

@ -6,7 +6,7 @@ from rest_framework.schemas import coreapi
from rest_framework.schemas.openapi import SchemaGenerator from rest_framework.schemas.openapi import SchemaGenerator
OPENAPI_MODE = 'openapi' OPENAPI_MODE = 'openapi'
OPENAPI_AGID_MODE = 'openapi-agid' # WiP OPENAPI_AGID_MODE = 'openapi-agid'
COREAPI_MODE = 'coreapi' COREAPI_MODE = 'coreapi'

8
rest_framework/schemas/agid_schema_views.py
View File

@ -21,13 +21,13 @@ basic use-cases:
Other access should target the submodules directly Other access should target the submodules directly
""" """
from rest_framework.settings import api_settings from rest_framework.settings import api_settings
from . import openapi_agid # noqa
from .inspectors import DefaultSchema # noqa
api_settings.defaults['DEFAULT_SCHEMA_CLASS'] = \ api_settings.defaults['DEFAULT_SCHEMA_CLASS'] = \
'rest_framework.schemas.openapi_agid.AgidAutoSchema' 'rest_framework.schemas.openapi_agid.AgidAutoSchema'
from . import openapi_agid
# from .openapi_agid import AgidAutoSchema, AgidSchemaGenerator # noqa
from .inspectors import DefaultSchema # noqa
def get_schema_view( def get_schema_view(
title=None, url=None, description=None, urlconf=None, renderer_classes=None, title=None, url=None, description=None, urlconf=None, renderer_classes=None,

2
rest_framework/schemas/generators.py
View File

@ -167,7 +167,7 @@ class BaseSchemaGenerator:
self.url = url self.url = url
self.endpoints = None self.endpoints = None
for k,v in kwargs.items(): for k, v in kwargs.items():
setattr(self, k, v) setattr(self, k, v)
def _initialise_endpoints(self): def _initialise_endpoints(self):

15
rest_framework/schemas/openapi_agid.py
View File

@ -1,10 +1,10 @@
from rest_framework import ( import warnings
RemovedInDRF314Warning, exceptions, renderers, serializers
)
from urllib.parse import urljoin from urllib.parse import urljoin
from . openapi import SchemaGenerator, AutoSchema from rest_framework import serializers
from . utils import get_pk_description, is_list_view
from .openapi import AutoSchema, SchemaGenerator
from .utils import is_list_view
class AgidSchemaGenerator(SchemaGenerator): class AgidSchemaGenerator(SchemaGenerator):
@ -31,8 +31,8 @@ class AgidSchemaGenerator(SchemaGenerator):
return servers return servers
def get_tags(self): def get_tags(self):
tags = getattr(self, 'tags', {}), tags = getattr(self, 'tags', {})
return tags[0] if isinstance(tags, tuple) else tags return tags
def get_schema(self, request=None, public=False): def get_schema(self, request=None, public=False):
""" """
@ -92,7 +92,6 @@ class AgidSchemaGenerator(SchemaGenerator):
return schema return schema
class AgidAutoSchema(AutoSchema): class AgidAutoSchema(AutoSchema):
def get_responses(self, path, method): def get_responses(self, path, method):

2
tests/schemas/test_openapi.py
View File

@ -54,7 +54,7 @@ class TestFieldMapping(TestCase):
cases = [ cases = [
(serializers.ListField(), {'items': {}, 'type': 'array'}), (serializers.ListField(), {'items': {}, 'type': 'array'}),
(serializers.ListField(child=serializers.BooleanField()), {'items': {'type': 'boolean'}, 'type': 'array'}), (serializers.ListField(child=serializers.BooleanField()), {'items': {'type': 'boolean'}, 'type': 'array'}),
(serializers.ListField(child=serializers.FloatField()), {'items': {'type': 'number'}, 'type': 'array'}), (serializers.ListField(child=serializers.FloatField()), {'items': {'type': 'number', 'format': 'float'}, 'type': 'array'}),
(serializers.ListField(child=serializers.CharField()), {'items': {'type': 'string'}, 'type': 'array'}), (serializers.ListField(child=serializers.CharField()), {'items': {'type': 'string'}, 'type': 'array'}),
(serializers.ListField(child=serializers.IntegerField(max_value=4294967295)), (serializers.ListField(child=serializers.IntegerField(max_value=4294967295)),
{'items': {'type': 'integer', 'maximum': 4294967295, 'format': 'int64'}, 'type': 'array'}), {'items': {'type': 'integer', 'maximum': 4294967295, 'format': 'int64'}, 'type': 'array'}),