Make ChromiumStatus work with 0.8.4.

scripts/master/chromium_status.py

-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Source file for buildbot.status module modifications. """
 
 import os
 import re
 import urllib
 
+import buildbot
 from buildbot import interfaces
 from buildbot import util
 import buildbot.process as process
 import buildbot.status.web.base as base
 import buildbot.status.web.baseweb as baseweb
 import buildbot.status.web.console as console
 import buildbot.status.web.waterfall as waterfall
 import buildbot.status.web.changes as changes
 import buildbot.status.web.builder as builder
-from buildbot.status.web.base import make_row
+
+if buildbot.version == '0.7.12':
+  from buildbot.status.web.base import make_row
+else:
+  ROW_TEMPLATE = '''
+  <div class="row">
+    <span class="label">%(label)s</span>
+    <span class="field">%(field)s</span>
+  </div>
+  '''
+  from twisted.web import html
+  def make_row(label, field):
+    """Imported from Buildbot 0.7.12."""
+    label = html.escape(label)
+    return ROW_TEMPLATE % {"label": label, "field": field}
+
 import buildbot.status.builder as statusbuilder
 import buildbot.sourcestamp as sourcestamp
 
 from twisted.python import log
 from twisted.python import components
 from twisted.web.util import Redirect
 from twisted.web import html
 from zope.interface import declarations
 
 from master.third_party import stats
@@ skipping 83 matching lines @@
       if self.revision:
         try:
           text += '<br>r%d' % int(self.revision)
         except ValueError:
           text += '<br>%s' % self.revision
       return text
     changes.Change.get_HTML_box = get_HTML_box
     changes.Change.get_HTML_box_hooked = True
 
 
-HookChangeHtmlBox()
+# In Buildbot 0.7.12, hook get_HTML_box to add the revision number to the change
+# revision to the waterfall.  In 0.8.4p1, modify Buildbot directly to add the
+# change revision.
+if buildbot.version == '0.7.12':
+  HookChangeHtmlBox()
 
 
 def GetAnnounce(public_html):
   """Creates DIV that provides visuals on tree status.
   """
   announce_path = os.path.join(public_html.path, 'announce.html')
   return GetStaticFileContent(announce_path)
 
 def GetStaticFileContent(announce_path):
   if os.path.exists(announce_path):
@@ skipping 319 matching lines @@
     self.putChild("waterfall", WaterfallStatusResource())
     self.putChild("console", ConsoleStatusResource(
         orderByTime=self.orderConsoleByTime))
     self.putChild("bot_status.json", console.ConsoleStatusResource())
     self.putChild("stats", stats.StatsStatusResource())
     self.putChild("grid", ConsoleStatusResource())
     self.putChild("tgrid", ConsoleStatusResource())
     self.putChild("builders", BuildersResource())
     self.putChild("horizontal_one_box_per_builder",
                   HorizontalOneBoxPerBuilder())