Minor tw code refactoringHEADmaster

1 files changed, 8 insertions, 9 deletions

diff --git a/israwhidebroken/controllers.py b/israwhidebroken/controllers.py
index 36203a2..da59367 100644
--- a/israwhidebroken/controllers.py
+++ b/israwhidebroken/controllers.py
@@ -4,22 +4,21 @@ from turbogears import controllers, expose, flash
 from israwhidebroken.model import Test, Tree, TestResult, hub
 from turbogears import identity, redirect
 from cherrypy import request, response
-import tw.forms as twf
+from tw.forms import Form, SingleSelectField, HiddenField
+from tw.api import WidgetsList
 # from israwhidebroken import json
 # import logging
 # log = logging.getLogger("israwhidebroken.controllers")
 
 # Simple select widget for submitting test results
 # TODO: ajaxify
-class ResultForm(twf.Form):
+class ResultForm(Form):
     show_errors = True
-    fields = [
-        twf.SingleSelectField('result', options=['none','pass','fail'],
-                              suppress_label=True),
-        twf.HiddenField('testid'),
-        twf.HiddenField('treeid'),
-  ]
-
+    class fields(WidgetsList):
+        result = SingleSelectField(options=['none','pass','fail'],
+                                   suppress_label=True)
+        testid = HiddenField()
+        treeid = HiddenField()
 
 fdict = {'none': None, 'pass': 1, 'fail': 0}
 def to_int(fstr):