Ticket #9230: forms.py.diff

django/forms/forms.py

@@ -362 +362 @@
         """
         return self.form.errors.get(self.name, self.form.error_class())
     errors = property(_errors)
-
-    def as_widget(self, widget=None, attrs=None, only_initial=False):
+    
+    def prepare_widget_render(self, widget=None, attrs=None, only_initial=False):
         """
-        Renders the field by rendering the passed widget, adding any HTML
-        attributes passed as attrs.  If no widget is specified, then the
-        field's default widget will be used.
+        Prepare the data needed for the widget rendering.
         """
         if not widget:
             widget = self.field.widget
@@ -388 +386 @@
             name = self.html_name
         else:
             name = self.html_initial_name
+            
+        return widget, name, data, attrs 
+
+    def as_widget(self, widget=None, attrs=None, only_initial=False):
+        """
+        Renders the field by rendering the passed widget, adding any HTML
+        attributes passed as attrs.  If no widget is specified, then the
+        field's default widget will be used.
+        """
+        widget, name, data, attrs = self.prepare_widget_render(widget, attrs, only_initial)
         return widget.render(name, data, attrs=attrs)
+    
+    def __iter__(self):
+        """
+        Check if current widget is iteratable and return the widget iterator.
+        """
+        widget, name, data, attrs = self.prepare_widget_render()
+        if not hasattr(widget, 'get_iterator'):
+            raise Exception, "Can not iterate over widget '%s'" % widget.__class__.__name__
+        return widget.get_iterator(name, data, attrs=attrs)
 
     def as_text(self, attrs=None, **kwargs):
         """