Ticket #14655: formset-iterable.diff

django/forms/formsets.py

@@ -48 +48 @@
 
     def __unicode__(self):
         return self.as_table()
+    
+    def __iter__(self):
+        """Yields the forms in the order they should be rendered"""
+        for form in self.forms:
+            yield form
+    
+    def __getitem__(self, index):
+        try:
+            return list(self)[index]
+        except IndexError:
+            raise IndexError('Index %d out of range for formset' % index)
+        
+    def __len__(self):
+        return sum(1 for _ in self)
 
     def _management_form(self):
         """Returns the ManagementForm instance for this FormSet."""
@@ -323 +337 @@
         # XXX: there is no semantic division between forms here, there
         # probably should be. It might make sense to render each form as a
         # table row with each field as a td.
-        forms = u' '.join([form.as_table() for form in self.forms])
+        forms = u' '.join([form.as_table() for form in self])
         return mark_safe(u'\n'.join([unicode(self.management_form), forms]))
 
     def as_p(self):
         "Returns this formset rendered as HTML <p>s."
-        forms = u' '.join([form.as_p() for form in self.forms])
+        forms = u' '.join([form.as_p() for form in self])
         return mark_safe(u'\n'.join([unicode(self.management_form), forms]))
 
     def as_ul(self):
         "Returns this formset rendered as HTML <li>s."
-        forms = u' '.join([form.as_ul() for form in self.forms])
+        forms = u' '.join([form.as_ul() for form in self])
         return mark_safe(u'\n'.join([unicode(self.management_form), forms]))
 
 def formset_factory(form, formset=BaseFormSet, extra=1, can_order=False,