Use "svn cat" in tools/submit_try

tools/submit_try

 #!/usr/bin/python
 
 # Copyright (c) 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.
 
 
 """
 submit_try: Submit a try request.
 
 This is a thin wrapper around the try request utilities in depot_tools which
 adds some validation and supports both git and svn.
 """
 
 
-from contextlib import closing
-
 import httplib
 import json
 import os
 import subprocess
 import sys
-import urllib2
+
+
+if os.name == 'nt':
+  SVN = 'svn.bat'
+else:
+  SVN = 'svn'
 
 
 def GetGlobalVariables():
   """ Retrieve a global variable from the global_variables.json file. """
   global_variables_file = ('http://skia.googlecode.com/svn/buildbot/'
                            'site_config/global_variables.json')
-  with closing(urllib2.urlopen(global_variables_file)) as f:
-    return json.load(f)
+  proc = subprocess.Popen([SVN, 'cat', global_variables_file],

[epoger, 2013/03/14 14:51:41]

It seems silly to have this subprocess-launching boilerplate code pasted
multiple places in the file.  Instead, maybe extract it into a call_svn()
function that raises an exception in case of failure?

Taking it a step further, can we make use of
https://code.google.com/p/skia/source/browse/trunk/tools/svn.py instead?  Feel
free to improve that as necessary...

[borenet, 2013/03/14 17:18:05]

Done.

+                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  exitcode = proc.wait()
+  if not exitcode == 0:
+    raise Exception('Could not retrieve global variables file from %s. '
+                    'Check your connection.' % global_variables_file)
+  global_variables = proc.communicate()[0]
+  return json.loads(global_variables)

[epoger, 2013/03/14 14:51:41]

should be json.load() instead of json.loads() ?

should be global_variables_file instead of global_variables?

[epoger, 2013/03/14 14:54:49]

Oh, I see this part is actually fine.  Sorry about the false alarm.

[borenet, 2013/03/14 17:18:05]

Removed the whole function, since it shouldn't get called more than once anyway.

 
 
 GLOBAL_VARIABLES = GetGlobalVariables()
 
 
 def GetGlobalVariable(var_name):
   return GLOBAL_VARIABLES[var_name]['value']
 
 
 # Alias which can be used to run a try on every builder.
@@ skipping 30 matching lines @@
   return depot_tools_dir
 
 
 def GetCheckoutRoot(is_svn=True):
   """ Determine where the local checkout is rooted.
 
   is_svn: boolean; whether we're in an SVN checkout. If False, assume we're in
       a git checkout.
   """
   if is_svn:
-    svn_cmd = 'svn.bat' if os.name == 'nt' else 'svn'
-    cmd = [svn_cmd, 'info']
+    cmd = [SVN, 'info']
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                             stderr=subprocess.STDOUT)
     if proc.wait() != 0:
       raise Exception('Couldn\'t find checkout root!')
     output = proc.communicate()[0].split('\n')
     url = None
     repo_root = None
     for line in output:
       if line.startswith(REPO_ROOT_STR):
         repo_root = line[len(REPO_ROOT_STR):].rstrip()
@@ skipping 179 matching lines @@
 
   # Parse and validate the command-line arguments.
   args = ValidateArgs(sys.argv[1:], trybots=trybots, is_svn=is_svn)
 
   # Submit the try request.
   SubmitTryRequest(args, is_svn=is_svn)
 
 
 if __name__ == '__main__':
   sys.exit(main())