--- a/talosnames/web.py	Tue Jul 10 21:36:24 2012 -0700
+++ b/talosnames/web.py	Tue Jul 10 23:19:29 2012 -0700
@@ -19,14 +19,7 @@
         self.api = TalosNames()
         self.template = file(template).read()
 
-    def __call__(self, environ, start_response):
-        request = Request(environ)
-        response = Response(content_type='text/html',
-                            body=self.render())
-        return response(environ, start_response)
-
-    def render(self):
-        template = tempita.HTMLTemplate(self.template)
+        # get data
         suites = sorted(self.api.suites.keys())
         tests = {}
         for suite in suites:
@@ -36,15 +29,25 @@
             except:
                 tests[suite] = None
 
-        data = {'suites': suites,
-                'commands': self.api.buildbot_commands,
-                'tbpl': dict([(suite, self.api.tbpl_name(suite))
-                              for suite in suites]),
-                'tests': tests,
-                'pprint': pprint.pformat,
-                'api': self.api
-                }
-        return template.substitute(data)
+        self.data = {'suites': suites,
+                     'commands': self.api.buildbot_commands,
+                     'tbpl': dict([(suite, self.api.tbpl_name(suite))
+                                   for suite in suites]),
+                     'tests': tests,
+                     'pprint': pprint.pformat,
+                     'api': self.api
+                     }
+
+
+    def __call__(self, environ, start_response):
+        request = Request(environ)
+        response = Response(content_type='text/html',
+                            body=self.render())
+        return response(environ, start_response)
+
+    def render(self):
+        template = tempita.HTMLTemplate(self.template)
+        return template.substitute(self.data)
 
 if __name__ == '__main__':
     from wsgiref import simple_server