diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/newforms/fields.py | 2 | ||||
| -rw-r--r-- | django/newforms/widgets.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/newforms/fields.py b/django/newforms/fields.py index 7c542b9001..509c099e86 100644 --- a/django/newforms/fields.py +++ b/django/newforms/fields.py @@ -457,7 +457,7 @@ class MultiValueField(Field): for i, field in enumerate(self.fields): try: field_value = value[i] - except KeyError: + except IndexError: field_value = None if self.required and field_value in EMPTY_VALUES: raise ValidationError(gettext(u'This field is required.')) diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py index d50b1921ea..5f1a130459 100644 --- a/django/newforms/widgets.py +++ b/django/newforms/widgets.py @@ -347,7 +347,7 @@ class MultiWidget(Widget): id_for_label = classmethod(id_for_label) def value_from_datadict(self, data, name): - return [data.get(name + '_%s' % i) for i in range(len(self.widgets))] + return [widget.value_from_datadict(data, name + '_%s' % i) for i, widget in enumerate(self.widgets)] def format_output(self, rendered_widgets): return u''.join(rendered_widgets) |