Update buildbot_tool and builders.pyl templates to remove 'master_type'.

scripts/common/chromium_utils.py

 # Copyright (c) 2012 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.
 
 """ Set of basic operations/utilities that are used by the build. """
 
 from contextlib import contextmanager
 import ast
 import base64
 import cStringIO
@@ skipping 1834 matching lines @@
   basedir = os.path.dirname(os.path.abspath(path))
   master_dirname = os.path.basename(basedir)
   master_name_comps = master_dirname.split('.')[1:]
   buildbot_path =  '.'.join(master_name_comps)
   master_classname =  ''.join(c[0].upper() + c[1:] for c in master_name_comps)
   builders['master_dirname'] = master_dirname
   builders.setdefault('master_classname', master_classname)
   builders.setdefault('buildbot_url',
                       'https://build.chromium.org/p/%s/' % buildbot_path)
 
+  builders.setdefault('buildbucket_bucket', None)
+  builders.setdefault('service_account_file', None)
+
+  # The _str fields are printable representations of Python values:
+  # if builders['foo'] == "hello", then builders['foo_str'] == "'hello'".
+  # This allows them to be read back in by Python scripts properly.
+  builders['buildbucket_bucket_str'] = repr(builders['buildbucket_bucket'])
+  builders['service_account_file_str'] = repr(builders['service_account_file'])
+
   return builders
 
 
 def GetSlavesFromBuildersFile(builders_path):
   """Read builders_path and return a list of slave dicts."""
   builders = ReadBuildersFile(builders_path)
   return GetSlavesFromBuilders(builders)
 
 
 def GetSlavesFromBuilders(builders):
@@ skipping 31 matching lines @@
 
   return slaves
 
 def GetSlaveNamesForBuilder(builders, builder_name):
   """Returns a list of slave hostnames for the given builder name."""
   slaves = []
   pool_names = builders['builders'][builder_name]['slave_pools']
   for pool_name in pool_names:
     slaves.extend(builders['slave_pools'][pool_name]['slaves'])
   return slaves