Refactor SubprocessCallAndFilter() to remove positional arguments.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """\
 Wrapper script around Rietveld's upload.py that simplifies working with groups
 of files.
 """
 
@@ skipping 125 matching lines @@
       while True:
         # Look in the repository at the current level for the file.
         for _ in range(5):
           content = ""
           try:
             # Take advantage of the fact that svn won't output to stderr in case
             # of success but will do in case of failure so don't mind putting
             # stderr into content_array.
             content_array = []
             svn_path = url_path + "/" + filename
-            SVN.RunAndFilterOutput(['cat', svn_path, '--non-interactive'], '.',
-                                   False, False, content_array.append)
+            SVN.RunAndFilterOutput(['cat', svn_path, '--non-interactive'],
+                                   cwd='.', filter_fn=content_array.append)
             # Exit the loop if the file was found. Override content.
             content = '\n'.join(content_array)
             break
-          except gclient_utils.Error, e:
+          except gclient_utils.Error:
             if content_array[0].startswith(
                 'svn: Can\'t get username or password'):
               ErrorExit('Your svn credentials expired. Please run svn update '
                         'to fix the cached credentials')
             if content_array[0].startswith('svn: Can\'t get password'):
               ErrorExit('If are using a Mac and svn --version shows 1.4.x, '
                   'please hack gcl.py to remove --non-interactive usage, it\'s'
                   'a bug on your installed copy')
             if not content_array[0].startswith('svn: File not found:'):
               # Try again.
@@ skipping 547 matching lines @@
   return ListFiles(False)
 
 
 @no_args
 def CMDstatus():
   """Lists modified and unknown files in the current directory down."""
   return ListFiles(True)
 
 
 @need_change_and_args
-@attrs(usage='[--no_presubmit] [--clobber] [--no_watchlists]')
+@attrs(usage='[--no_presubmit] [--no_watchlists]')
 def CMDupload(change_info, args):
   """Uploads the changelist to the server for review.
 
   This does not submit a try job; use gcl try to submit a try job.
   """
   if '-s' in args or '--server' in args:
     ErrorExit('Don\'t use the -s flag, fix codereview.settings instead')
   if not change_info.GetFiles():
     print "Nothing to upload, changelist is empty."
     return 0
   if not OptionallyDoPresubmitChecks(change_info, False, args):
     return 1
   no_watchlists = (FilterFlag(args, "--no_watchlists") or
                    FilterFlag(args, "--no-watchlists"))
 
   # Map --send-mail to --send_mail
   if FilterFlag(args, "--send-mail"):
     args.append("--send_mail")
 
-  # Supports --clobber for the try server.
-  clobber = FilterFlag(args, "--clobber")
-
   upload_arg = ["upload.py", "-y"]
   server = GetCodeReviewSetting("CODE_REVIEW_SERVER")
   if not server:
     ErrorExit(CODEREVIEW_SETTINGS_FILE_NOT_FOUND)
   upload_arg.append("--server=%s" % server)
   upload_arg.extend(args)
 
   desc_file = ""
   if change_info.issue:  # Uploading a new patchset.
     found_message = False
@@ skipping 564 matching lines @@
     if command:
       return command(argv[1:])
     # Unknown command, try to pass that to svn
     return CMDpassthru(argv)
   except gclient_utils.Error, e:
     print('Got an exception')
     print(str(e))
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))