Update latitude sample.
Reviewed in https://codereview.appspot.com/9329046/.
diff --git a/samples/latitude/latitude.py b/samples/latitude/latitude.py
index 3700f01..c0a629f 100644
--- a/samples/latitude/latitude.py
+++ b/samples/latitude/latitude.py
@@ -35,82 +35,15 @@
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
-import gflags
-import httplib2
-import logging
-import os
-import pprint
import sys
-from apiclient.discovery import build
-from oauth2client.file import Storage
-from oauth2client.client import AccessTokenRefreshError
-from oauth2client.client import flow_from_clientsecrets
-from oauth2client.tools import run
-
-
-FLAGS = gflags.FLAGS
-
-# CLIENT_SECRETS, name of a file containing the OAuth 2.0 information for this
-# application, including client_id and client_secret, which are found
-# on the API Access tab on the Google APIs
-# Console <http://code.google.com/apis/console>
-CLIENT_SECRETS = 'client_secrets.json'
-
-# Helpful message to display in the browser if the CLIENT_SECRETS file
-# is missing.
-MISSING_CLIENT_SECRETS_MESSAGE = """
-WARNING: Please configure OAuth 2.0
-
-To make this sample run you will need to populate the client_secrets.json file
-found at:
-
- %s
-
-with information from the APIs Console <https://code.google.com/apis/console>.
-
-""" % os.path.join(os.path.dirname(__file__), CLIENT_SECRETS)
-
-# Set up a Flow object to be used if we need to authenticate.
-FLOW = flow_from_clientsecrets(CLIENT_SECRETS,
- scope='https://www.googleapis.com/auth/latitude.all.best',
- message=MISSING_CLIENT_SECRETS_MESSAGE)
-
-
-# The gflags module makes defining command-line options easy for
-# applications. Run this program with the '--help' argument to see
-# all the flags that it understands.
-gflags.DEFINE_enum('logging_level', 'ERROR',
- ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'],
- 'Set the level of logging detail.')
-
+from oauth2client import client
+from apiclient import sample_tools
def main(argv):
- # Let the gflags module process the command-line arguments
- try:
- argv = FLAGS(argv)
- except gflags.FlagsError, e:
- print '%s\\nUsage: %s ARGS\\n%s' % (e, argv[0], FLAGS)
- sys.exit(1)
-
- # Set the logging according to the command-line flag
- logging.getLogger().setLevel(getattr(logging, FLAGS.logging_level))
-
- # If the Credentials don't exist or are invalid run through the native client
- # flow. The Storage object will ensure that if successful the good
- # Credentials will get written back to a file.
- storage = Storage('latitude.dat')
- credentials = storage.get()
-
- if credentials is None or credentials.invalid:
- credentials = run(FLOW, storage)
-
- # Create an httplib2.Http object to handle our HTTP requests and authorize it
- # with our good Credentials.
- http = httplib2.Http()
- http = credentials.authorize(http)
-
- service = build("latitude", "v1", http=http)
+ service, flags = sample_tools.init(
+ argv, 'latitude', 'v1', __doc__, __file__,
+ scope='https://www.googleapis.com/auth/latitude.all.best')
try:
body = {
@@ -125,7 +58,7 @@
print service.currentLocation().insert(body=body).execute()
- except AccessTokenRefreshError:
+ except client.AccessTokenRefreshError:
print ("The credentials have been revoked or expired, please re-run"
"the application to re-authorize")