Start removing dependence on gflags.
Reviewed in https://codereview.appspot.com/7628044/.
This only removes the dependency from the core library, a second CL will
update all the samples.
diff --git a/samples/plus/plus.py b/samples/plus/plus.py
old mode 100644
new mode 100755
index c6089f9..b88395b
--- a/samples/plus/plus.py
+++ b/samples/plus/plus.py
@@ -1,7 +1,7 @@
-#!/usr/bin/python2.4
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2013 Google Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,122 +17,80 @@
"""Simple command-line sample for the Google+ API.
-Command-line application that retrieves the users latest content and
-then adds a new entry.
-
-Usage:
- $ python plus.py
-
-You can also get help on all the command-line flags the program understands
-by running:
-
- $ python plus.py --help
-
-To get detailed log output run:
-
- $ python plus.py --logging_level=DEBUG
-"""
+Command-line application that retrieves the list of the user's posts."""
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
-import gflags
-import httplib2
+import argparse
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
+import httplib2
+from apiclient import discovery
+from oauth2client import file
+from oauth2client import client
+from oauth2client import tools
-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)
+# Console <http://code.google.com/apis/console>.
+CLIENT_SECRETS = os.path.join(os.path.dirname(__file__), 'client_secrets.json')
# Set up a Flow object to be used if we need to authenticate.
-FLOW = flow_from_clientsecrets(CLIENT_SECRETS,
+FLOW = client.flow_from_clientsecrets(CLIENT_SECRETS,
scope='https://www.googleapis.com/auth/plus.me',
- 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.')
+ message=tools.message_if_missing(CLIENT_SECRETS))
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))
+ # Parse command-line options.
+ parser = argparse.ArgumentParser(
+ description=__doc__,
+ formatter_class=argparse.RawDescriptionHelpFormatter,
+ parents=[tools.argparser])
+ flags = parser.parse_args(argv[1:])
# 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('plus.dat')
+ storage = file.Storage('plus.dat')
credentials = storage.get()
if credentials is None or credentials.invalid:
- credentials = run(FLOW, storage)
+ credentials = tools.run(FLOW, storage, flags)
# Create an httplib2.Http object to handle our HTTP requests and authorize it
# with our good Credentials.
- http = httplib2.Http()
- http = credentials.authorize(http)
+ http = credentials.authorize(httplib2.Http())
- service = build("plus", "v1", http=http)
+ service = discovery.build('plus', 'v1', http=http)
try:
- person = service.people().get(userId='me').execute(http=http)
+ person = service.people().get(userId='me').execute()
- print "Got your ID: %s" % person['displayName']
+ print 'Got your ID: %s' % person['displayName']
print
- print "%-040s -> %s" % ("[Activitity ID]", "[Content]")
+ print '%-040s -> %s' % ('[Activitity ID]', '[Content]')
- # Don't execute the request until we reach the paging loop below
+ # Don't execute the request until we reach the paging loop below.
request = service.activities().list(
userId=person['id'], collection='public')
+
# Loop over every activity and print the ID and a short snippet of content.
- while ( request != None ):
+ while request is not None:
activities_doc = request.execute()
for item in activities_doc.get('items', []):
print '%-040s -> %s' % (item['id'], item['object']['content'][:30])
request = service.activities().list_next(request, activities_doc)
- except AccessTokenRefreshError:
- print ("The credentials have been revoked or expired, please re-run"
- "the application to re-authorize")
+ except client.AccessTokenRefreshError:
+ print ('The credentials have been revoked or expired, please re-run'
+ 'the application to re-authorize.')
if __name__ == '__main__':
main(sys.argv)