Remove the dependency of tools/bot/bot_utils.py on tools/utils.py

tools/bots/bot_utils.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import hashlib
 import imp
 import os
+import platform
 import string
 import subprocess
 import sys
 
 DART_DIR = os.path.abspath(
     os.path.normpath(os.path.join(__file__, '..', '..', '..')))
 
-def GetUtils():
-  '''Dynamically load the tools/utils.py python module.'''
-  return imp.load_source('utils', os.path.join(DART_DIR, 'tools', 'utils.py'))
-
-utils = GetUtils()

[ricow1, 2014/05/15 13:28:38]

you can't do this, this is used in many of the other scripts in here, i.e.,
other scripts here will use bot_utils.utils

[Bill Hesse, 2014/05/15 13:57:03]

OK, I only tested this one.  So I'll leave the function in, but not call it in
this file.  All the other files call the function, and do not use
bot_utils.utils directly, fortunately.

-
 SYSTEM_RENAMES = {
   'win32': 'windows',
   'windows': 'windows',
   'win': 'windows',
 
   'linux': 'linux',
   'linux2': 'linux',
   'lucid32': 'linux',
   'lucid64': 'linux',
 
@@ skipping 182 matching lines @@
     raise Exception("Failed to execute %s." % command)
   return (stdout, stderr, p.returncode)
 
 class GSUtil(object):
   GSUTIL_IS_SHELL_SCRIPT = False
   GSUTIL_PATH = None
   USE_DART_REPO_VERSION = False
 
   def _layzCalculateGSUtilPath(self):
     if not GSUtil.GSUTIL_PATH:
-      buildbot_gsutil = utils.GetBuildbotGSUtilPath()
+      buildbot_gsutil = '/b/build/scripts/slave/gsutil'
+      if platform.system() == 'Windows':
+        buildbot_gsutil = 'e:\\\\b\\build\\scripts\\slave\\gsutil'
       if os.path.isfile(buildbot_gsutil) and not GSUtil.USE_DART_REPO_VERSION:
         GSUtil.GSUTIL_IS_SHELL_SCRIPT = True
         GSUtil.GSUTIL_PATH = buildbot_gsutil
       else:
         dart_gsutil = os.path.join(DART_DIR, 'third_party', 'gsutil', 'gsutil')
         if os.path.isfile(dart_gsutil):
           GSUtil.GSUTIL_IS_SHELL_SCRIPT = False
           GSUtil.GSUTIL_PATH = dart_gsutil
         elif GSUtil.USE_DART_REPO_VERSION:
           raise Exception("Dart repository version of gsutil required, "
                           "but not found.")
         else:
           # We did not find gsutil, look in path
           possible_locations = list(os.environ['PATH'].split(os.pathsep))
           for directory in possible_locations:
             location = os.path.join(directory, 'gsutil')
             if os.path.isfile(location):
               GSUtil.GSUTIL_IS_SHELL_SCRIPT = False
               GSUtil.GSUTIL_PATH = location
               break
       assert GSUtil.GSUTIL_PATH
 
   def execute(self, gsutil_args):
     self._layzCalculateGSUtilPath()
 
     env = dict(os.environ)
     # If we're on the buildbot, we use a specific boto file.
-    if utils.GetUserName() == 'chrome-bot':
+    user_name = os.environ.get(
+        'USERNAME' if sys.platform == 'win32' else 'USER', '')
+    if user_name == 'chrome-bot':
       boto_config = {
-        'linux': '/mnt/data/b/build/site_config/.boto',
-        'macos': '/Volumes/data/b/build/site_config/.boto',
-        'win32': r'e:\b\build\site_config\.boto',
-      }[utils.GuessOS()]
+        'Linux': '/mnt/data/b/build/site_config/.boto',
+        'Darwin': '/Volumes/data/b/build/site_config/.boto',
+        'Windows': r'e:\b\build\site_config\.boto',
+      }[platform.system()]
       env['AWS_CREDENTIAL_FILE'] = boto_config
       env['BOTO_CONFIG'] = boto_config
 
     if GSUtil.GSUTIL_IS_SHELL_SCRIPT:
       gsutil_command = [GSUtil.GSUTIL_PATH]
     else:
       gsutil_command = [sys.executable, GSUtil.GSUTIL_PATH]
 
     return run(gsutil_command + gsutil_args, env=env,
                shell=(GSUtil.GSUTIL_IS_SHELL_SCRIPT and
@@ skipping 60 matching lines @@
 
   return checksum_filename
 
 def GetChannelFromName(name):
   """Get the channel from the name. Bleeding edge builders don't 
       have a suffix."""
   channel_name = string.split(name, '-').pop()
   if channel_name in Channel.ALL_CHANNELS:
     return channel_name
   return Channel.BLEEDING_EDGE