summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorGrzegorz Slusarek <grzegorz.slusarek@gmail.com>2014-12-08 23:37:59 +0100
committerTim Graham <timograham@gmail.com>2014-12-12 08:47:21 -0500
commit0dea81cd6d34b3e41cc4bbec99b5fdf06142b09e (patch)
tree23ac08dc2f4414f89b27de21f84225f5fca6e422 /django/forms
parent43041ee48c802418ec935a2ece59f876f5888c40 (diff)
Fixed #23674 -- Fixed a crash when a MultiValueField has invalid data.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/fields.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 7ca8ddc2e2..6f0dc16c35 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -1104,7 +1104,11 @@ class MultiValueField(Field):
if not isinstance(initial, list):
initial = self.widget.decompress(initial)
for field, initial, data in zip(self.fields, initial, data):
- if field.has_changed(field.to_python(initial), data):
+ try:
+ initial = field.to_python(initial)
+ except ValidationError:
+ return True
+ if field.has_changed(initial, data):
return True
return False