# HG changeset patch
# User Arthur Lutz <arthur.lutz@logilab.fr>
# Date 1554378574 -7200
# Node ID dc6d44e69a70a3a0df81e818e4d2a688e048758f
# Parent  31412adee482ce6122554ebdd83ed4ebfdf41e19# Parent  fb8c39cf084900b49e6e89dfba545c6f54d21a72
Merging heads of old, closed branch

diff -r fb8c39cf0849 -r dc6d44e69a70 web/formwidgets.py
--- a/web/formwidgets.py	Thu May 14 12:48:32 2009 +0200
+++ b/web/formwidgets.py	Thu Apr 04 13:49:34 2019 +0200
@@ -199,26 +199,6 @@
 
     def render(self, form, field):
         name, curvalues, attrs = self._render_attrs(form, field)
-        options = []
-        for label, value in field.vocabulary(form):
-            if value in curvalues:
-                tag = tags.input(name=name, value=value, type=self.type,
-                                 checked='checked', **attrs)
-            else:
-                tag = tags.input(name=name, value=value, type=self.type,
-                                 **attrs)
-            options.append(tag + label)
-        return '<br/>\n'.join(options)
-
-
-class Radio(Input):
-    """<input type='radio'>, for field having a specific vocabulary. One
-    input will be generated for each possible value.
-    """
-    type = 'radio'
-
-    def render(self, form, field):
-        name, curvalues, attrs = self._render_attrs(form, field)
         domid = attrs.pop('id', None)
         options = []
         for i, (label, value) in enumerate(field.vocabulary(form)):
@@ -232,6 +212,12 @@
         return '\n'.join(options)
 
 
+class Radio(CheckBox):
+    """<input type='radio'>, for field having a specific vocabulary. One
+    input will be generated for each possible value.
+    """
+    type = 'radio'
+
 # javascript widgets ###########################################################
 
 class DateTimePicker(TextInput):