summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClairePhila <ClairePhila@byom.de>2017-02-10 17:26:02 +0100
committerGitHub <noreply@github.com>2017-02-10 17:26:02 +0100
commitedad02af06abd11e8a4753b150197d3c7b421774 (patch)
tree0b1a7be717da7a30bb2ca51673e8e1b0bc0aeb97
parentab83d4d8fe76c2c6bc3b0a96aa2baed9c9f07f19 (diff)
Allow UUIDField to be None when deserializing
-rw-r--r--django/db/models/fields/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 527ed8e423..e5dc5e9e8a 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -2337,6 +2337,8 @@ class UUIDField(Field):
return value.hex
def to_python(self, value):
+ if value is None:
+ return None
if not isinstance(value, uuid.UUID):
try:
return uuid.UUID(value)