[Buildbot-commits] buildbot/buildbot/status/web baseweb.py, 1.5, 1.6

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29289/buildbot/status/web

Modified Files:
	baseweb.py 
Log Message:
[project @ web-refactoring: Waterfall: put the customized WaterfallStatusResource at the root, rather than using a redirection]

Original author: warner at lothar.com
Date: 2007-07-31 02:40:55+00:00

Index: baseweb.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/baseweb.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- baseweb.py	1 Aug 2007 22:08:37 -0000	1.5
+++ baseweb.py	1 Aug 2007 22:08:43 -0000	1.6
@@ -1,14 +1,13 @@
 
-import os, sys, urllib
+import os, sys
 from itertools import count
-from zope.interface import implements
 
 from twisted.python import log
-from twisted.application import service, strports
-from twisted.web import server, distrib, static, util
+from twisted.application import strports
+from twisted.web import server, distrib, static
 from twisted.spread import pb
 
-from buildbot.interfaces import IStatusReceiver, IControl
+from buildbot.interfaces import IControl
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, EXCEPTION
 
 from buildbot.status.base import StatusReceiverMultiService
@@ -435,10 +434,4 @@
         if robots_txt:
             data = open(robots_txt, "rb").read()
             self.putChild("robots.txt", static.Data(data, "text/plain"))
-        root_target = "/waterfall"
-        args = []
-        if categories:
-            args.extend(["category=%s" % urllib.quote(c) for c in categories])
-        if args:
-            root_target += "?" + "&".join(args)
-        self.putChild("", util.Redirect(root_target))
+        self.putChild("", WaterfallStatusResource(categories, css))