Update oauth2client to v2.0.1 and googleapiclient to v1.5.0.

client/third_party/infra_libs/ts_mon/common/monitors.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.
 
 """Classes representing the monitoring interface for tasks or devices."""
 
 
 import base64
 import json
 import logging
 import traceback
 
 from googleapiclient import discovery
-from oauth2client import gce
+from oauth2client.contrib import gce

[Sergey Berezin, 2016/03/07 17:41:15]

I'd rather update this upstream first. For instance, we can wrap the imports in
try: except to accommodate for the two versions for now. Ideally, we should
upgrade infra.git as well.

 from oauth2client.client import GoogleCredentials
 from oauth2client.file import Storage
 import httplib2
 
 from infra_libs import httplib2_utils
 from infra_libs.ts_mon.common import http_metrics
 from infra_libs.ts_mon.protos import metrics_pb2
 
 
 # Special string that can be passed through as the credentials path to use the
@@ skipping 40 matching lines @@
       'https://www.googleapis.com/auth/pubsub',
   ]
 
   TIMEOUT = 10  # seconds
 
   def _load_credentials(self, credentials_file_path):
     if credentials_file_path == GCE_CREDENTIALS:
       return gce.AppAssertionCredentials(self._SCOPES)
     if credentials_file_path == APPENGINE_CREDENTIALS:  # pragma: no cover
       # This import doesn't work outside appengine, so delay it until it's used.
-      from oauth2client import appengine
+      from oauth2client.contrib import appengine
       from google.appengine.api import app_identity
       logging.info('Initializing with service account %s',
                    app_identity.get_service_account_name())
       return appengine.AppAssertionCredentials(self._SCOPES)
 
     with open(credentials_file_path, 'r') as credentials_file:
       credentials_json = json.load(credentials_file)
     if credentials_json.get('type', None):
       credentials = GoogleCredentials.from_stream(credentials_file_path)
       credentials = credentials.create_scoped(self._SCOPES)
@@ skipping 85 matching lines @@
     logging.info('Flushing monitoring metrics:\n%s', text)
     if self._fh is not None:
       self._fh.write(text + '\n\n')
       self._fh.flush()
 
 
 class NullMonitor(Monitor):
   """Class that doesn't send metrics anywhere."""
   def send(self, metric_pb):
     pass