encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge ac6d75ece6 into 871ce34983

Browse Source
This commit is contained in:
Brett Haydon 2017-05-25 07:58:19 +00:00 committed by GitHub
commit f6d4a40c18
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -829,6 +829,8 @@ class UUIDField(Field):
super(UUIDField, self).__init__(**kwargs) super(UUIDField, self).__init__(**kwargs)
def to_internal_value(self, data): def to_internal_value(self, data):
if data == '' and self.default:
data = self.get_default()
if not isinstance(data, uuid.UUID): if not isinstance(data, uuid.UUID):
try: try:
if isinstance(data, six.integer_types): if isinstance(data, six.integer_types):

8
tests/test_fields.py
View File

@ -749,6 +749,14 @@ class TestUUIDField(FieldValues):
self._test_format('urn', 'urn:uuid:00000000-0000-0000-0000-000000000000') self._test_format('urn', 'urn:uuid:00000000-0000-0000-0000-000000000000')
self._test_format('hex', '0' * 32) self._test_format('hex', '0' * 32)
def test_default_uuid(self):
"""
If `default=uuid` then '' is a valid input.
"""
field = serializers.UUIDField(default=uuid.uuid4)
output = field.run_validation('')
assert isinstance(output, uuid.UUID)
class TestIPAddressField(FieldValues): class TestIPAddressField(FieldValues):
""" """