Ticket #3959: label.diff

fields.py

@@ -36 +36 @@
     # Tracks each time a Field instance is created. Used to retain order.
     creation_counter = 0
 
-    def __init__(self, required=True, widget=None, label=None, initial=None, help_text=None):
+    def __init__(self, label=None, required=True, widget=None, initial=None, help_text=None):
+        # label -- A verbose name for this field, for use in displaying this
+        #          field in a form. By default, Django will use a "pretty"
+        #          version of the form field name, if the Field is part of a
+        #          Form.
         # required -- Boolean that specifies whether the field is required.
         #             True by default.
         # widget -- A Widget class, or instance of a Widget class, that should
         #           be used for this Field when displaying it. Each Field has a
         #           default Widget that it'll use if you don't specify this. In
         #           most cases, the default widget is TextInput.
-        # label -- A verbose name for this field, for use in displaying this
-        #          field in a form. By default, Django will use a "pretty"
-        #          version of the form field name, if the Field is part of a
-        #          Form.
         # initial -- A value to use in this Field's initial display. This value
         #            is *not* used as a fallback if data isn't given.
         # help_text -- An optional string to use as "help text" for this Field.
@@ -332 +332 @@
         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)
+    def __init__(self, label=None, choices=(), required=True, widget=Select, initial=None, help_text=None):
+        super(ChoiceField, self).__init__(label, required, widget, initial, help_text)
         self.choices = choices
 
     def _get_choices(self):
@@ -365 +365 @@
 class MultipleChoiceField(ChoiceField):
     hidden_widget = MultipleHiddenInput
 
-    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 __init__(self, label=None, choices=(), required=True, widget=SelectMultiple, initial=None, help_text=None):
+        super(MultipleChoiceField, self).__init__(label, choices, required, widget, initial, help_text)
 
     def clean(self, value):
         """