Ticket #3114: multiple_choice_4194.patch

django/newforms/forms.py

@@ -2 +2 @@
 Form classes
 """
 
-from django.utils.datastructures import SortedDict
+from django.utils.datastructures import SortedDict, MultiValueDict
 from django.utils.html import escape
 from fields import Field
 from widgets import TextInput, Textarea, HiddenInput
@@ -221 +221 @@
 
     def _data(self):
         "Returns the data for this BoundField, or None if it wasn't given."
+        if isinstance(self.form.data, MultiValueDict) and self.field.widget.requires_data_list:
+            return self.form.data.getlist(self.name)
         return self.form.data.get(self.name, None)
     data = property(_data)
 

django/newforms/widgets.py

@@ -10 +10 @@
 
 from util import StrAndUnicode, smart_unicode
 from django.utils.html import escape
+from django.utils.datastructures import MultiValueDict
 from itertools import chain
 
 try:
@@ -43 +44 @@
         Given a dictionary of data and this widget's name, returns the value
         of this widget. Returns None if it's not provided.
         """
+        if isinstance(data, MultiValueDict) and self.requires_data_list:
+            return data.getlist(name)
         return data.get(name, None)
 
     def id_for_label(self, id_):