Button takes optional argument html

web/form.py

@@ -305,14 +305,24 @@ def get_value(self):
         return self.checked
 
 class Button(Input):
+    """HTML Button.
+    
+    >>> Button("save").render()
+    '<button id="save" name="save">save</button>'
+    >>> Button("action", value="save", html="<b>Save Changes</b>").render()
+    '<button id="action" value="save" name="action"><b>Save Changes</b></button>'
+    """
     def __init__(self, name, *validators, **attrs):
         super(Button, self).__init__(name, *validators, **attrs)
         self.description = ""
 
     def render(self):
         attrs = self.attrs.copy()
         attrs['name'] = self.name
-        return '<button %s>%s</button>' % (attrs, self.description)
+        if self.value is not None:
+            attrs['value'] = self.value
+        html = attrs.pop('html', None) or net.websafe(self.name)
+        return '<button %s>%s</button>' % (attrs, html)
 
 class Hidden(Input):
     """Hidden Input.