Ticket #3821: fields_choices.patch

fields.py

@@ -330 +330 @@
         return {True: True, False: False}.get(value, None)
 
 class ChoiceField(Field):
-    def __init__(self, choices=(), required=True, widget=Select, label=None, initial=None, help_text=None):
-        super(ChoiceField, self).__init__(required, widget, label, initial, help_text)
+    widget = Select
+    
+    def __init__(self, choices=(), *args, **kwargs):
+        super(ChoiceField, self).__init__(*args, **kwargs)
         self.choices = choices
 
     def _get_choices(self):
@@ -362 +364 @@
 
 class MultipleChoiceField(ChoiceField):
     hidden_widget = MultipleHiddenInput
+    widget = SelectMultiple
 
-    def __init__(self, choices=(), required=True, widget=SelectMultiple, label=None, initial=None, help_text=None):
-        super(MultipleChoiceField, self).__init__(choices, required, widget, label, initial, help_text)
-
     def clean(self, value):
         """
         Validates that the input is a list or tuple.