Support for |change| argument to |GetPreferredTrySlaves()|, try 2.

presubmit_support.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.6.1'
 
 # TODO(joi) Add caching where appropriate/needed. The API is designed to allow
 # caching (between all different invocations of presubmit scripts for a given
 # change). We should add it as our presubmit scripts start feeling slow.
 
 import cPickle  # Exposed through the API.
 import cStringIO  # Exposed through the API.
 import fnmatch
 import glob
+import inspect
 import logging
 import marshal  # Exposed through the API.
 import optparse
 import os  # Somewhat exposed through the API.
 import pickle  # Exposed through the API.
 import random
 import re  # Exposed through the API.
 import sys  # Parts exposed through API.
 import tempfile  # Exposed through the API.
 import time
@@ skipping 839 matching lines @@
     p = os.path.join(directory, 'PRESUBMIT.py')
     if os.path.isfile(p):
       results.append(p)
 
   logging.debug('Presubmit files: %s' % ','.join(results))
   return results
 
 
 class GetTrySlavesExecuter(object):
   @staticmethod
-  def ExecPresubmitScript(script_text, presubmit_path, project):
+  def ExecPresubmitScript(script_text, presubmit_path, project, change):
     """Executes GetPreferredTrySlaves() from a single presubmit script.
 
     Args:
       script_text: The text of the presubmit script.
       presubmit_path: Project script to run.
       project: Project name to pass to presubmit script for bot selection.
 
     Return:
       A list of try slaves.
     """
     context = {}
     try:
       exec script_text in context
     except Exception, e:
       raise PresubmitFailure('"%s" had an exception.\n%s' % (presubmit_path, e))
 
     function_name = 'GetPreferredTrySlaves'
     if function_name in context:
-      try:
-        result = eval(function_name + '(' + repr(project) + ')', context)
-      except TypeError:
-        result = eval(function_name + '()', context)
+      get_preferred_try_slaves = context[function_name]
+      function_info = inspect.getargspec(get_preferred_try_slaves)
+      if len(function_info[0]) == 1:
+        result = get_preferred_try_slaves(project)
+      elif len(function_info[0]) == 2:
+        result = get_preferred_try_slaves(project, change)
+      else:
+        result = get_preferred_try_slaves()
       if not isinstance(result, types.ListType):
         raise PresubmitFailure(
             'Presubmit functions must return a list, got a %s instead: %s' %
             (type(result), str(result)))
       for item in result:
         if not isinstance(item, basestring):
           raise PresubmitFailure('All try slaves names must be strings.')
         if item != item.strip():
           raise PresubmitFailure(
               'Try slave names cannot start/end with whitespace')
     else:
       result = []
     return result
 
 
-def DoGetTrySlaves(changed_files,
+def DoGetTrySlaves(change,
+                   changed_files,
                    repository_root,
                    default_presubmit,
                    project,
                    verbose,
                    output_stream):
   """Get the list of try servers from the presubmit scripts.
 
   Args:
     changed_files: List of modified files.
     repository_root: The repository root.
     default_presubmit: A default presubmit script to execute in any case.
     project: Optional name of a project used in selecting trybots.
     verbose: Prints debug info.
     output_stream: A stream to write debug output to.
 
   Return:
     List of try slaves
   """
   presubmit_files = ListRelevantPresubmitFiles(changed_files, repository_root)
   if not presubmit_files and verbose:
     output_stream.write("Warning, no presubmit.py found.\n")
   results = []
   executer = GetTrySlavesExecuter()
   if default_presubmit:
     if verbose:
       output_stream.write("Running default presubmit script.\n")
     fake_path = os.path.join(repository_root, 'PRESUBMIT.py')
     results += executer.ExecPresubmitScript(
-        default_presubmit, fake_path, project)
+        default_presubmit, fake_path, project, change)
   for filename in presubmit_files:
     filename = os.path.abspath(filename)
     if verbose:
       output_stream.write("Running %s\n" % filename)
     # Accept CRLF presubmit script.
     presubmit_script = gclient_utils.FileRead(filename, 'rU')
     results += executer.ExecPresubmitScript(
-        presubmit_script, filename, project)
+        presubmit_script, filename, project, change)
 
   slaves = list(set(results))
   if slaves and verbose:
     output_stream.write(', '.join(slaves))
     output_stream.write('\n')
   return slaves
 
 
 class PresubmitExecuter(object):
   def __init__(self, change, committing, rietveld_obj, verbose):
@@ skipping 282 matching lines @@
   except PresubmitFailure, e:
     print >> sys.stderr, e
     print >> sys.stderr, 'Maybe your depot_tools is out of date?'
     print >> sys.stderr, 'If all fails, contact maruel@'
     return 2
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(Main(None))