Ticket #8272: fieldset.diff

django/forms/fields.py

@@ -57 +57 @@
     creation_counter = 0
 
     def __init__(self, required=True, widget=None, label=None, initial=None,
-                 help_text=None, error_messages=None):
+                 help_text=None, error_messages=None, fieldset=None):
         # required -- Boolean that specifies whether the field is required.
         #             True by default.
         # widget -- A Widget class, or instance of a Widget class, that should
@@ -71 +71 @@
         # 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.
+        # fieldset -- An optional string to declare a fieldset for this Field for template purposes.
         if label is not None:
             label = smart_unicode(label)
         self.required, self.label, self.initial = required, label, initial
@@ -102 +103 @@
         set_class_error_messages(messages, self.__class__)
         messages.update(error_messages or {})
         self.error_messages = messages
+        
+        self.fieldset = fieldset
 
     def clean(self, value):
         """

django/forms/forms.py

@@ -305 +305 @@
         else:
             self.label = self.field.label
         self.help_text = field.help_text or ''
-
+        self.fieldset = field.fieldset or ''
+        
     def __unicode__(self):
         """Renders this field as an HTML widget."""
         return self.as_widget()