Make the config -> pythonish conversion a gclient module function.

recipe_modules/bot_update/api.py

 # Copyright 2014 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.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 from recipe_engine import recipe_api
 
 
 # This is just for testing, to indicate if a master is using a Git scheduler
 # or not.
 SVN_MASTERS = (
     'experimental.svn',
 )
 
 
-def jsonish_to_python(spec, is_top=False):
-  """Turn a json spec into a python parsable object.
-
-  This exists because Gclient specs, while resembling json, is actually
-  ingested using a python "eval()".  Therefore a bit of plumming is required
-  to turn our newly constructed Gclient spec into a gclient-readable spec.
-  """
-  ret = ''
-  if is_top:  # We're the 'top' level, so treat this dict as a suite.
-    ret = '\n'.join(
-      '%s = %s' % (k, jsonish_to_python(spec[k])) for k in sorted(spec)
-    )
-  else:
-    if isinstance(spec, dict):
-      ret += '{'
-      ret += ', '.join(
-        "%s: %s" % (repr(str(k)), jsonish_to_python(spec[k]))
-        for k in sorted(spec)
-      )
-      ret += '}'
-    elif isinstance(spec, list):
-      ret += '['
-      ret += ', '.join(jsonish_to_python(x) for x in spec)
-      ret += ']'
-    elif isinstance(spec, basestring):
-      ret = repr(str(spec))
-    else:
-      ret = repr(spec)
-  return ret
-
-
 class BotUpdateApi(recipe_api.RecipeApi):
 
   def __init__(self, mastername, buildername, slavename, issue, patchset,
                patch_url, repository, gerrit_ref, rietveld, revision,
                parent_got_revision, deps_revision_overrides, fail_patch,
                *args, **kwargs):
     self._mastername = mastername
     self._buildername = buildername
     self._slavename = slavename
     self._issue = issue
@@ skipping 41 matching lines @@
         the 'rietveld' property.
       issue: The rietveld issue number to use. If omitted, will infer from
         the 'issue' property.
       patchset: The rietveld issue patchset to use. If omitted, will infer from
         the 'patchset' property.
     """
     refs = refs or []
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
     cfg = gclient_config or self.m.gclient.c
-    spec_string = jsonish_to_python(cfg.as_jsonish(), True)
 
     # Used by bot_update to determine if we want to run or not.
     master = self._mastername
     builder = self._buildername
     slave = self._slavename
 
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
     root = patch_root
     if root is None:
@@ skipping 41 matching lines @@
 
     rev_map = cfg.got_revision_mapping.as_jsonish()
 
     flags = [
         # 1. Do we want to run? (master/builder/slave).
         ['--master', master],
         ['--builder', builder],
         ['--slave', slave],
 
         # 2. What do we want to check out (spec/root/rev/rev_map).
-        ['--spec', spec_string],
+        ['--spec', self.m.gclient.config_to_pythonish(cfg)],
         ['--root', root],
         ['--revision_mapping_file', self.m.json.input(rev_map)],
         ['--git-cache-dir', cfg.cache_dir],
 
         # 3. How to find the patch, if any (issue/patchset/patch_url).
         ['--issue', issue],
         ['--patchset', patchset],
         ['--patch_url', patch_url],
         ['--rietveld_server', rietveld or self._rietveld],
         ['--gerrit_repo', gerrit_repo],
@@ skipping 117 matching lines @@
 
       # bot_update actually just sets root to be the folder name of the
       # first solution.
       if step_result.json.output['did_run']:
         co_root = step_result.json.output['root']
         cwd = kwargs.get('cwd', self.m.path['slave_build'])
         if 'checkout' not in self.m.path:
           self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result