Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rest_framework/schemas/openapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def _map_serializer(self, serializer):
schema['writeOnly'] = True
if field.allow_null:
schema['nullable'] = True
if field.default and field.default != empty: # why don't they use None?!
if field.default and field.default != empty and not callable(field.default): # why don't they use None?!
schema['default'] = field.default
if field.help_text:
schema['description'] = str(field.help_text)
Expand Down
16 changes: 16 additions & 0 deletions tests/schemas/test_openapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,22 @@ def test_serializer_hstorefield(self):
properties = response_schema['items']['properties']
assert properties['hstore']['type'] == 'object'

def test_serializer_callable_default(self):
path = '/'
method = 'GET'
view = create_view(
views.ExampleGenericAPIView,
method,
create_request(path),
)
inspector = AutoSchema()
inspector.view = view

responses = inspector._get_responses(path, method)
response_schema = responses['200']['content']['application/json']['schema']
properties = response_schema['items']['properties']
assert 'default' not in properties['uuid_field']

def test_serializer_validators(self):
path = '/'
method = 'GET'
Expand Down
1 change: 1 addition & 0 deletions tests/schemas/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class ExampleSerializer(serializers.Serializer):
date = serializers.DateField()
datetime = serializers.DateTimeField()
hstore = serializers.HStoreField()
uuid_field = serializers.UUIDField(default=uuid.uuid4)


class ExampleGenericAPIView(generics.GenericAPIView):
Expand Down