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

recipe_modules/gclient/api.py

 # Copyright 2013 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.
 
 from recipe_engine import recipe_api
 
 
 class RevisionResolver(object):
   """Resolves the revision based on build properties."""
 
@@ skipping 32 matching lines @@
     """Resolve the revision if project matches, otherwise default to HEAD."""
     if properties.get('project') == self.project:
       return (properties.get(self.parent_got_revision) or
               properties.get('revision') or
               'HEAD')
     return (properties.get(self.parent_got_revision) or
             'HEAD')
 
 
 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]))
@@ skipping 61 matching lines @@
   @spec_alias.deleter
   def spec_alias(self):
     self._spec_alias = None
 
   def get_config_defaults(self):
     return {
       'USE_MIRROR': self.use_mirror,
       'CACHE_DIR': self.m.path['git_cache'],
     }
 
+  @staticmethod
+  def config_to_pythonish(cfg):
+    return jsonish_to_python(cfg.as_jsonish(), True)
+
   def resolve_revision(self, revision):
     if hasattr(revision, 'resolve'):
       return revision.resolve(self.m.properties)
     return revision
 
   def sync(self, cfg, with_branch_heads=False, **kwargs):
     revisions = []
     for i, s in enumerate(cfg.solutions):
       if s.safesync_url:  # prefer safesync_url in gclient mode
         continue
@@ skipping 90 matching lines @@
     """Return a step generator function for gclient checkouts."""
     cfg = gclient_config or self.c
     assert cfg.complete()
 
     if revert is self.RevertOnTryserver:
       revert = self.m.tryserver.is_tryserver
 
     if inject_parent_got_revision:
       self.inject_parent_got_revision(cfg, override=True)
 
-    spec_string = jsonish_to_python(cfg.as_jsonish(), True)
-
-    self('setup', ['config', '--spec', spec_string], **kwargs)
+    self('setup', ['config', '--spec', self.config_to_pythonish(cfg)], **kwargs)
 
     sync_step = None
     try:
       if not cfg.GIT_MODE:
         try:
           if revert:
             self.revert(**kwargs)
         finally:
           sync_step = self.sync(cfg, with_branch_heads=with_branch_heads,
                                 **kwargs)
@@ skipping 64 matching lines @@
           for (path, dir, files) in os.walk(build_path):
             for cur_file in files:
               if cur_file.endswith('index.lock'):
                 path_to_file = os.path.join(path, cur_file)
                 print 'deleting %s' % path_to_file
                 os.remove(path_to_file)
       """,
       args=[self.m.path['slave_build']],
       infra_step=True,
     )