innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.11.x] Refs #27148 -- Fixed UUIDField.to_python(None) crash. 

Regression in 2f9861d823.

Backport of d26413113c from master
This commit is contained in:
ClairePhila 2017-02-10 18:28:16 +01:00 committed by Tim Graham
parent 0c21c49068
commit 4101b57b19
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/fields/__init__.py
View File

@ -2387,7 +2387,7 @@ class UUIDField(Field):
return value.hex return value.hex
def to_python(self, value): def to_python(self, value):
if not isinstance(value, uuid.UUID): if value is not None and not isinstance(value, uuid.UUID):
try: try:
return uuid.UUID(value) return uuid.UUID(value)
except (AttributeError, ValueError): except (AttributeError, ValueError):

13
tests/model_fields/test_uuid.py
View File

@ -54,13 +54,16 @@ class TestSaveLoad(TestCase):
UUIDModel.objects.create(field='not-a-uuid') UUIDModel.objects.create(field='not-a-uuid')
class TestMigrations(SimpleTestCase): class TestMethods(SimpleTestCase):
def test_deconstruct(self): def test_deconstruct(self):
field = models.UUIDField() field = models.UUIDField()
name, path, args, kwargs = field.deconstruct() name, path, args, kwargs = field.deconstruct()
self.assertEqual(kwargs, {}) self.assertEqual(kwargs, {})
def test_to_python(self):
self.assertIsNone(models.UUIDField().to_python(None))
class TestQuerying(TestCase): class TestQuerying(TestCase):
def setUp(self): def setUp(self):
@ -88,6 +91,10 @@ class TestSerialization(SimpleTestCase):
'[{"fields": {"field": "550e8400-e29b-41d4-a716-446655440000"}, ' '[{"fields": {"field": "550e8400-e29b-41d4-a716-446655440000"}, '
'"model": "model_fields.uuidmodel", "pk": null}]' '"model": "model_fields.uuidmodel", "pk": null}]'
) )
nullable_test_data = (
'[{"fields": {"field": null}, '
'"model": "model_fields.nullableuuidmodel", "pk": null}]'
)
def test_dumping(self): def test_dumping(self):
instance = UUIDModel(field=uuid.UUID('550e8400e29b41d4a716446655440000')) instance = UUIDModel(field=uuid.UUID('550e8400e29b41d4a716446655440000'))
@ -98,6 +105,10 @@ class TestSerialization(SimpleTestCase):
instance = list(serializers.deserialize('json', self.test_data))[0].object instance = list(serializers.deserialize('json', self.test_data))[0].object
self.assertEqual(instance.field, uuid.UUID('550e8400-e29b-41d4-a716-446655440000')) self.assertEqual(instance.field, uuid.UUID('550e8400-e29b-41d4-a716-446655440000'))
def test_nullable_loading(self):
instance = list(serializers.deserialize('json', self.nullable_test_data))[0].object
self.assertIsNone(instance.field)
class TestValidation(SimpleTestCase): class TestValidation(SimpleTestCase):
def test_invalid_uuid(self): def test_invalid_uuid(self):