Empty webkitpy/common/net/buildbot/__init__.py and update imports.

third_party/WebKit/Tools/Scripts/webkitpy/common/host.py

 # Copyright (c) 2010 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import logging
 import os
 import sys
 
 from webkitpy.common.checkout.scm.detection import SCMDetector
 from webkitpy.common.memoized import memoized
-from webkitpy.common.net import buildbot, web
+from webkitpy.common.net.buildbot.buildbot import BuildBot

[Dirk Pranke, 2016/05/05 23:51:44]

we should move the buildbot files up into net and get rid of the subdirectory.

[qyearsley, 2016/05/06 17:31:23]

Done.

+from webkitpy.common.net import web
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.layout_tests.port.factory import PortFactory
 
 
 _log = logging.getLogger(__name__)
 
 
 class Host(SystemHost):
 
     def __init__(self):
         SystemHost.__init__(self)
         self.web = web.Web()
 
         self._scm = None
 
         # Everything below this line is WebKit-specific and belongs on a higher-level object.
-        self.buildbot = buildbot.BuildBot()
+        self.buildbot = BuildBot()
 
         # FIXME: Unfortunately Port objects are currently the central-dispatch objects of the NRWT world.
         # In order to instantiate a port correctly, we have to pass it at least an executive, user, scm, and filesystem
         # so for now we just pass along the whole Host object.
         # FIXME: PortFactory doesn't belong on this Host object if Port is going to have a Host (circular dependency).
         self.port_factory = PortFactory(self)
 
         self._engage_awesome_locale_hacks()
 
     # We call this from the Host constructor, as it's one of the
@@ skipping 44 matching lines @@
 
     def scm(self):
         return self._scm
 
     def scm_for_path(self, path):
         # FIXME: make scm() be a wrapper around this, and clean up the way
         # callers call initialize_scm() (to remove patch_directories) and scm().
         if sys.platform == "win32":
             self._engage_awesome_windows_hacks()
         return SCMDetector(self.filesystem, self.executive).detect_scm_system(path)