Ticket #6458: make_radioselect_iterable2.diff

django/newforms/forms.py

@@ -272 +272 @@
         return self.form.errors.get(self.name, self.form.error_class())
     errors = property(_errors)
 
-    def as_widget(self, widget=None, attrs=None):
-        """
-        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.
-        """
+    def get_data_attrs_and_widget(self, widget, attrs):
         if not widget:
             widget = self.field.widget
         attrs = attrs or {}
@@ -290 +285 @@
                 data = data()
         else:
             data = self.data
+        return data, attrs, widget
+
+    def as_widget(self, widget=None, attrs=None):
+        """
+        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.
+        """
+        data, attrs, widget = self.get_data_attrs_and_widget(widget, attrs)
         return widget.render(self.html_name, data, attrs=attrs)
 
     def as_text(self, attrs=None):
@@ -348 +352 @@
             return self.html_name
         return ''
     auto_id = property(_auto_id)
+
+    def __iter__(self):
+        data, attrs, _ = self.get_data_attrs_and_widget(None, None) #widget, attrs)
+        for i in self.field.widget.iter(self.html_name, data, attrs=attrs):
+            yield i
+
+    def __getitem__(self, i):
+        items_list = []
+        items_dict = {}
+        for item in self:
+            items_list.append(item)
+            items_dict[item.choice_value] = item
+        try:
+            return items_list[i]
+        except TypeError:
+            return items_dict[i]

django/newforms/widgets.py

@@ -341 +341 @@
     def render(self, name, value, attrs=None, choices=()):
         return self.get_renderer(name, value, attrs, choices).render()
 
+    def iter(self, name, value, attrs=None, choices=()):
+        for i in self.get_renderer(name, value, attrs, choices):
+            yield i
+
     def id_for_label(self, id_):
         # RadioSelect is represented by multiple <input type="radio"> fields,
         # each of which has a distinct ID. The IDs are made distinct by a "_X"

tests/regressiontests/forms/widgets.py

@@ -757 +757 @@
 <li><label><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label></li>
 </ul>
 
+>>> w = RadioSelect()
+>>> for i in w.iter('beatle', 'J', choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), attrs={'id':'bar'}):
+...     print i
+<label><input checked="checked" type="radio" id="bar_0" value="J" name="beatle" /> John</label>
+<label><input type="radio" id="bar_1" value="P" name="beatle" /> Paul</label>
+<label><input type="radio" id="bar_2" value="G" name="beatle" /> George</label>
+<label><input type="radio" id="bar_3" value="R" name="beatle" /> Ringo</label>
+
 # CheckboxSelectMultiple Widget ###############################################
 
 >>> w = CheckboxSelectMultiple()