Ticket #3114: multiple_choice.patch

django/newforms/fields.py

@@ -277 +277 @@
             val = smart_unicode(val)
             new_value.append(val)
         # Validate that each value in the value list is in self.choices.
-        valid_values = set([k for k, v in self.choices])
+        valid_values = set([smart_unicode(k) for k, v in self.choices])
         for val in new_value:
             if val not in valid_values:
                 raise ValidationError(gettext(u'Select a valid choice. %s is not one of the available choices.') % val)

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
@@ -38 +38 @@
 
     def __init__(self, data=None, auto_id=False): # TODO: prefix stuff
         self.ignore_errors = data is None
-        self.data = data or {}
+        self.data = data or MultiValueDict()
         self.auto_id = auto_id
         self.clean_data = None # Stores the data after clean() has been called.
         self.__errors = None # Stores the errors after clean() has been called.
@@ -210 +210 @@
 
     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 +45 @@
         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_):