Fix submit_try

tools/buildbot_globals.py

 #!/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.
 
 """
 Provides read access to buildbot's global_variables.json .
 """
 
 
-from contextlib import closing
-
 import HTMLParser
-import base64
 import json
 import re
+import retrieve_from_googlesource
 import svn
 import sys
-import urllib2
 
 
 _global_vars = None
 
 
-_GLOBAL_VARS_JSON_BASE64_URL = (
-    'https://skia.googlesource.com/buildbot/+/master/'
-    'site_config/global_variables.json?format=TEXT')
+SKIABOT_REPO = 'https://skia.googlesource.com/buildbot'
+_GLOBAL_VARS_PATH = 'site_config/global_variables.json'
 
 
 class GlobalVarsRetrievalError(Exception):
   """Exception which is raised when the global_variables.json file cannot be
   retrieved from the Skia buildbot repository."""
   pass
 
 
 class JsonDecodeError(Exception):
   """Exception which is raised when the global_variables.json file cannot be
@@ skipping 15 matching lines @@
   Args:
       var_name: string; the variable to look up.
   Returns:
       The value of the variable.
   Raises:
       NoSuchGlobalVariable if there is no variable with that name.
   """
   global _global_vars
   if not _global_vars:
     try:
-      with closing(urllib2.urlopen(_GLOBAL_VARS_JSON_BASE64_URL)) as f:
-        global_vars_text = base64.b64decode(f.read())
+      global_vars_text = retrieve_from_googlesource.get(SKIABOT_REPO,
+                                                        _GLOBAL_VARS_PATH)
     except Exception as e:
-      raise GlobalVarsRetrievalError('Failed to retrieve %s:\n%s' %
-                                     (_GLOBAL_VARS_JSON_BASE64_URL, str(e)))
+      raise GlobalVarsRetrievalError('Failed to retrieve %s from %s:\n%s' %
+                                     (_GLOBAL_VARS_PATH, SKIABOT_REPO, str(e)))
     try:
       _global_vars = json.loads(global_vars_text)
     except ValueError as e:
       raise JsonDecodeError(e.message + '\n' + global_vars_text)
   try:
     return _global_vars[var_name]['value']
   except KeyError:
     raise NoSuchGlobalVariable(var_name)
 
 
 if __name__ == '__main__':
   print Get(sys.argv[1])