Update sample to latest discovery format. Reviewed in http://codereview.appspot.com/4468041/
diff --git a/samples/localdiscovery/buzz.py b/samples/localdiscovery/buzz.py
index c769576..31ad031 100644
--- a/samples/localdiscovery/buzz.py
+++ b/samples/localdiscovery/buzz.py
@@ -11,52 +11,14 @@
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
-from apiclient.discovery import build
from apiclient.discovery import build_from_document
-from apiclient.oauth import FlowThreeLegged
-from apiclient.ext.authtools import run
-from apiclient.ext.file import Storage
-from apiclient.oauth import CredentialsInvalidError
-import gflags
-import sys
import httplib2
-import logging
import os
import pprint
-import sys
-FLAGS = gflags.FLAGS
-
-gflags.DEFINE_enum('logging_level', 'ERROR',
- ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'],
- 'Set the level of logging detail.')
-
-
-def main(argv):
- try:
- argv = FLAGS(argv)
- except gflags.FlagsError, e:
- print '%s\\nUsage: %s ARGS\\n%s' % (e, argv[0], FLAGS)
- sys.exit(1)
-
- logging.getLogger().setLevel(getattr(logging, FLAGS.logging_level))
-
- storage = Storage('buzz.dat')
- credentials = storage.get()
- if credentials is None or credentials.invalid == True:
- buzz_discovery = build("buzz", "v1").auth_discovery()
- flow = FlowThreeLegged(buzz_discovery,
- consumer_key='anonymous',
- consumer_secret='anonymous',
- user_agent='python-buzz-sample/1.0',
- domain='anonymous',
- scope='https://www.googleapis.com/auth/buzz',
- xoauth_displayname='Google API Client Example App')
- credentials = run(flow, storage)
-
+def main():
http = httplib2.Http()
- http = credentials.authorize(http)
# Load the local copy of the discovery document
f = file(os.path.join(os.path.dirname(__file__), "buzz.json"), "r")
@@ -71,20 +33,11 @@
# Construct a service from the local documents
service = build_from_document(discovery,
base="https://www.googleapis.com/",
- future=future,
http=http,
- developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
- activities = service.activities()
+ future=future)
- try:
- # Retrieve the first two activities
- activitylist = activities.list(
- max_results='2', scope='@self', userId='@me').execute()
- print "Retrieved the first two activities"
- except CredentialsInvalidError:
- print 'Your credentials are no longer valid.'
- print 'Please re-run this application to re-authorize.'
+ pprint.pprint(service.activities().search(q='lady gaga').execute())
if __name__ == '__main__':
- main(sys.argv)
+ main()