summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSanyam Khurana <sanyam.khurana01@gmail.com>2018-10-25 03:13:41 +0530
committerTim Graham <timograham@gmail.com>2018-10-24 20:26:57 -0400
commit83c7096f2a84450957615ef52ffed0bee5f72606 (patch)
tree9df0361459a07f40094cc7b9139f57369fcca9c3 /django
parentfd49701ab9bb9352b549ec02600af1ee35794d40 (diff)
Fixed #29869 -- Made UUIDField.to_python() convert integers.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 162d6ec716..04c7f002bc 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -2319,8 +2319,9 @@ class UUIDField(Field):
def to_python(self, value):
if value is not None and not isinstance(value, uuid.UUID):
+ input_form = 'int' if isinstance(value, int) else 'hex'
try:
- return uuid.UUID(value)
+ return uuid.UUID(**{input_form: value})
except (AttributeError, ValueError):
raise exceptions.ValidationError(
self.error_messages['invalid'],