Move the perf dashboard upload logic to top-level.

mojo/devtools/common/devtoolslib/perf_dashboard.py

 # Copyright 2015 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.
 
 # Disable the line-too-long warning.
 # pylint: disable=C0301
 """This module implements the Chromium Performance Dashboard JSON v1.0 data
 format.
 
 See http://www.chromium.org/developers/speed-infra/performance-dashboard/sending-data-to-the-performance-dashboard.
@@ skipping 97 matching lines @@
   """Returns the number of git commits in the repository of the cwd."""
   return subprocess.check_output(
       ['git', 'rev-list', 'HEAD', '--count']).strip()
 
 
 def _get_current_commit():
   """Returns the hash of the current commit in the repository of the cwd."""
   return subprocess.check_output(["git", "rev-parse", "HEAD"]).strip()
 
 
+class _UploadException(Exception):
+  pass
+
+
+def _upload(server_url, json_data):
+  """Make an HTTP POST with the given data to the performance dashboard.
+
+  Args:
+    server_url: URL of the performance dashboard instance.
+    json_data: JSON string that contains the data to be sent.
+
+  Raises:
+    _UploadException: An error occurred during uploading.
+  """
+  # When data is provided to urllib2.Request, a POST is sent instead of GET.
+  # The data must be in the application/x-www-form-urlencoded format.
+  data = urllib.urlencode({"data": json_data})
+  req = urllib2.Request("%s/add_point" % server_url, data)
+  try:
+    urllib2.urlopen(req)
+  except urllib2.HTTPError as e:
+    raise _UploadException('HTTPError: %d. Response: %s\n'
+                           'JSON: %s\n' % (e.code, e.read(), json_data))
+  except urllib2.URLError as e:
+    raise _UploadException('URLError: %s for JSON %s\n' %
+                           (str(e.reason), json_data))
+  except httplib.HTTPException as e:
+    raise _UploadException('HTTPException for JSON %s\n' % json_data)
+
+
 def upload_chart_data(master_name, bot_name, test_name, builder_name,
                       build_number, chart_data, server_url=None, dry_run=False):
   """Uploads the provided chart data to an instance of performance dashboard.
   See the argparse help above for description of the arguments.
 
 
   Returns:
     A boolean value indicating whether the operation succeeded or not.
   """
-  class _UploadException(Exception):
-    pass
-
-  def _upload(server_url, json_data):
-    """Make an HTTP POST with the given data to the performance dashboard.
-
-    Args:
-      server_url: URL of the performance dashboard instance.
-      json_data: JSON string that contains the data to be sent.
-
-    Raises:
-      _UploadException: An error occurred during uploading.
-    """
-    # When data is provided to urllib2.Request, a POST is sent instead of GET.
-    # The data must be in the application/x-www-form-urlencoded format.
-    data = urllib.urlencode({"data": json_data})
-    req = urllib2.Request("%s/add_point" % server_url, data)
-    try:
-      urllib2.urlopen(req)
-    except urllib2.HTTPError as e:
-      raise _UploadException('HTTPError: %d. Response: %s\n'
-                             'JSON: %s\n' % (e.code, e.read(), json_data))
-    except urllib2.URLError as e:
-      raise _UploadException('URLError: %s for JSON %s\n' %
-                             (str(e.reason), json_data))
-    except httplib.HTTPException as e:
-      raise _UploadException('HTTPException for JSON %s\n' % json_data)
 
   if (not master_name or not bot_name or not test_name or not builder_name or
       not build_number):
     print ('Cannot upload perf data to the dashboard because not all of the '
            'following values are specified: master-name, bot-name, test_name, '
            'builder-name, build-number.')
     return False
 
   point_id = _get_commit_count()
   cur_commit = _get_current_commit()
@@ skipping 32 matching lines @@
 
     dashboard_params = urllib.urlencode({
         'masters': master_name,
         'bots': bot_name,
         'tests': test_name,
         'rev': point_id
     })
     print 'Results Dashboard: %s/report?%s' % (upload_url, dashboard_params)
 
   return True