Make ChromiumStatus work with 0.8.4.

scripts/master/master_utils.py

 # 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.
 
 import os
 import re
 
 import buildbot
 from buildbot import interfaces, util
 from buildbot.buildslave import BuildSlave
 from buildbot.status import mail
 from buildbot.status.builder import BuildStatus
 from twisted.python import log
 from zope.interface import implements
 
 from master.autoreboot_buildslave import AutoRebootBuildSlave
-try:
-  from master.chromium_status import WebStatus
-except ImportError:
-  from buildbot.status.web.baseweb import WebStatus
+from master.chromium_status import WebStatus
 
 from master import slaves_list
 import config
 
 
 def HackMaxTime(maxTime=8*60*60):
   """Set maxTime default value to 8 hours. This function must be called before
   adding steps."""
   from buildbot.process.buildstep import RemoteShellCommand
   assert RemoteShellCommand.__init__.func_defaults == (None, 1, 1, 1200, None,
@@ skipping 223 matching lines @@
     execfile('.manhole', values)
     if 'debugPassword' in values:
       c['debugPassword'] = values['debugPassword']
     interface = 'tcp:%s:interface=127.0.0.1' % values.get('port', 0)
     if 'port' in values and 'user' in values and 'password' in values:
       c['manhole'] = manhole.PasswordManhole(interface, values['user'],
                                             values['password'])
     elif 'port' in values:
       c['manhole'] = manhole.AuthorizedKeysManhole(interface,
           os.path.expanduser("~/.ssh/authorized_keys"))