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

Merge 6b0027688b into 871ce34983

Browse Source
This commit is contained in:
Andrei Prădan 2017-05-23 02:38:50 +00:00 committed by GitHub
commit 60bbba020a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -832,6 +832,8 @@ class UUIDField(Field):
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):
# if isinstance(data, bool):
# self.fail('invalid', value=data)
return uuid.UUID(int=data) return uuid.UUID(int=data)
elif isinstance(data, six.string_types): elif isinstance(data, six.string_types):
return uuid.UUID(hex=data) return uuid.UUID(hex=data)

3
tests/test_fields.py
View File

@ -731,7 +731,8 @@ class TestUUIDField(FieldValues):
} }
invalid_inputs = { invalid_inputs = {
'825d7aeb-05a9-45b5-a5b7': ['"825d7aeb-05a9-45b5-a5b7" is not a valid UUID.'], '825d7aeb-05a9-45b5-a5b7': ['"825d7aeb-05a9-45b5-a5b7" is not a valid UUID.'],
(1, 2, 3): ['"(1, 2, 3)" is not a valid UUID.'] (1, 2, 3): ['"(1, 2, 3)" is not a valid UUID.'],
True: ['"True" is not a valid UUID.'],
} }
outputs = { outputs = {
uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda'): '825d7aeb-05a9-45b5-a5b7-05df87923cda' uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda'): '825d7aeb-05a9-45b5-a5b7-05df87923cda'