Refactor SubprocessCallAndFilter() to remove positional arguments.

trychange.py

 #!/usr/bin/python
 # Copyright (c) 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.
 """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.
 """
 
 import datetime
@@ skipping 79 matching lines @@
     items = path.split('@')
     assert len(items) <= 2
     self.checkout_root = items[0]
     items.append(None)
     self.diff_against = items[1]
     self.options = options
     self.files = self.options.files
     self.options.files = None
     self.codereview_settings = None
     self.codereview_settings_file = 'codereview.settings'
+    self.gclient_root = None
 
   def GetFileNames(self):
     """Return the list of files in the diff."""
     return self.files
 
   def GetCodeReviewSetting(self, key):
     """Returns a value for the given key for this repository.
 
     Uses gcl-style settings from the repository."""
     if self.codereview_settings is None:
@@ skipping 19 matching lines @@
       'patchlevel': self.GetCodeReviewSetting('TRYSERVER_PATCHLEVEL'),
     }
     logging.info('\n'.join(['%s: %s' % (k, v)
                             for (k, v) in settings.iteritems() if v]))
     for (k, v) in settings.iteritems():
       if v and getattr(self.options, k) is None:
         setattr(self.options, k, v)
 
   def _GclientStyleSettings(self):
     """Find the root, assuming a gclient-style checkout."""
-    self.gclient_root = None
     if not self.options.no_gclient and not self.options.root:
       root = self.checkout_root
       self.gclient_root = gclient_utils.FindGclientRoot(root)
       if self.gclient_root:
         logging.info('Found .gclient at %s' % self.gclient_root)
         self.options.root = gclient_utils.PathDifference(self.gclient_root,
                                                          root)
 
   def AutomagicalSettings(self):
     """Determines settings based on supported code review and checkout tools.
@@ skipping 144 matching lines @@
 def _SendChangeHTTP(options):
   """Send a change to the try server using the HTTP protocol."""
   if not options.host:
     raise NoTryServerAccess('Please use the --host option to specify the try '
         'server host to connect to.')
   if not options.port:
     raise NoTryServerAccess('Please use the --port option to specify the try '
         'server port to connect to.')
 
   values = _ParseSendChangeOptions(options)
-  description = ''.join("%s=%s\n" % (k,v) for (k,v) in values.iteritems())
+  description = ''.join("%s=%s\n" % (k, v) for (k, v) in values.iteritems())
   values['patch'] = options.diff
 
   url = 'http://%s:%s/send_try_patch' % (options.host, options.port)
   proxies = None
   if options.proxy:
     if options.proxy.lower() == 'none':
       # Effectively disable HTTP_PROXY or Internet settings proxy setup.
       proxies = {}
     else:
       proxies = {'http': options.proxy, 'https': options.proxy}
@@ skipping 23 matching lines @@
 
 
 def _SendChangeSVN(options):
   """Send a change to the try server by committing a diff file on a subversion
   server."""
   if not options.svn_repo:
     raise NoTryServerAccess('Please use the --svn_repo option to specify the'
                             ' try server svn repository to connect to.')
 
   values = _ParseSendChangeOptions(options)
-  description = ''.join("%s=%s\n" % (k,v) for (k,v) in values.iteritems())
+  description = ''.join("%s=%s\n" % (k, v) for (k, v) in values.iteritems())
   logging.info('Sending by SVN')
   logging.info(description)
   logging.info(options.svn_repo)
   logging.info(options.diff)
   if options.dry_run:
     return
 
   # Create a temporary directory, put a uniquely named file in it with the diff
   # content and svn import that.
   temp_dir = tempfile.mkdtemp()
@@ skipping 393 matching lines @@
   except (InvalidScript, NoTryServerAccess), e:
     if swallow_exception:
       return 1
     print e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(TryChange(None, [], False))