Allow PRESUBMIT.py files to have old and new-style trybot specifications (as long as each file is c…

trychange.py

 #!/usr/bin/env python
 # 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.
 
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
@@ skipping 363 matching lines @@
                                         options.email)
     trybots = presubmit_support.DoGetTrySlaves(
         change,
         checkouts[0].GetFileNames(),
         checkouts[0].checkout_root,
         root_presubmit,
         options.project,
         options.verbose,
         sys.stdout)
     if trybots:
-      if isinstance(trybots[0], basestring):
-        # PRESUBMIT.py sent us an old-style string list of bots.
-        # _ParseBotList's testfilter is set to None otherwise it will complain.
-        bot_spec = _ApplyTestFilter(options.testfilter,
-                                    _ParseBotList(trybots, None))
-      else:
-        # PRESUBMIT.py sent us a new-style (bot, set()) specification.
-        bot_spec = _ApplyTestFilter(options.testfilter, trybots)
+      old_style = filter(lambda x: isinstance(x, basestring), trybots)
+      new_style = filter(lambda x: isinstance(x, tuple), trybots)
+
+      # _ParseBotList's testfilter is set to None otherwise it will complain.
+      bot_spec = _ApplyTestFilter(options.testfilter,
+                                  _ParseBotList(old_style, None))
+
+      bot_spec.extend(_ApplyTestFilter(options.testfilter, new_style))
 
   except ImportError:
     pass
 
   return bot_spec
 
 
 def _ParseSendChangeOptions(bot_spec, options):
   """Parse common options passed to _SendChangeHTTP and _SendChangeSVN."""
   values = [
@@ skipping 531 matching lines @@
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(TryChange(None, None, False))