openstack/deb-python-oauth2client
Code Issues Proposed changes

Updated all samples to use 'service' as the object returned from build()

Browse Source
This commit is contained in:
Joe Gregorio
2011-02-25 15:17:14 -05:00
parent f863f7ad23
commit 1ae3e74c08
18 changed files with 49 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apiclient/discovery.py
View File

@@ -239,6 +239,7 @@ def createResource(http, baseUrl, model, requestBuilder,
methodDesc['parameters']['body'] = {
'description': 'The request body.',
'type': 'object',
'required': True,
}
argmap = {} # Map from method parameter name to query parameter name

5
apiclient/ext/django_orm.py
View File

@@ -1,5 +1,8 @@
from django.db import models
import apiclient
import base64
import pickle
from django.db import models
class OAuthCredentialsField(models.Field):

4
samples/appengine/main.py
View File

@@ -53,8 +53,8 @@ class MainHandler(webapp.RequestHandler):
if c:
http = httplib2.Http()
http = c.credentials.authorize(http)
p = build("buzz", "v1", http=http)
activities = p.activities()
service = build("buzz", "v1", http=http)
activities = service.activities()
activitylist = activities.list(scope='@consumption',
userId='@me').execute()
logging.info(activitylist)

6
samples/buzz/buzz.py
View File

@@ -43,9 +43,9 @@ def main():
http = httplib2.Http()
http = credentials.authorize(http)
p = build("buzz", "v1", http=http,
service = build("buzz", "v1", http=http,
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
activities = p.activities()
activities = service.activities()
try:
# Retrieve the first two activities
@@ -82,7 +82,7 @@ def main():
}
}
item = activitylist['items'][0]
comment = p.comments().insert(
comment = service.comments().insert(
userId=item['actor']['id'], postId=item['id'], body=comment_body
).execute()
print 'Added a comment to the new activity'

4
samples/customsearch/main.py
View File

@@ -19,9 +19,9 @@ import pprint
def main():
p = build("customsearch", "v1",
service = build("customsearch", "v1",
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
res = p.cse().list(
res = service.cse().list(
q='lectures',
cx='017576662512468239146:omuauf_lfve',
).execute()

4
samples/diacritize/main.py
View File

@@ -22,9 +22,9 @@ import pprint
def main():
p = build("diacritize", "v1",
service = build("diacritize", "v1",
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
print p.diacritize().corpus().get(
print service.diacritize().corpus().get(
lang='ar',
last_letter='false',
message=u'مثال لتشكيل'

8
samples/django_sample/buzz/views.py
View File

@@ -20,8 +20,8 @@ def index(request):
c = Credential.objects.get(id=request.user)
http = httplib2.Http()
http = c.credential.authorize(http)
p = build("buzz", "v1", http=http)
activities = p.activities()
service = build("buzz", "v1", http=http)
activities = service.activities()
activitylist = activities.list(scope='@consumption',
userId='@me').execute()
logging.info(activitylist)
@@ -31,8 +31,8 @@ def index(request):
})
except Credential.DoesNotExist:
p = build("buzz", "v1")
flow = FlowThreeLegged(p.auth_discovery(),
service = build("buzz", "v1")
flow = FlowThreeLegged(service.auth_discovery(),
consumer_key='anonymous',
consumer_secret='anonymous',
user_agent='google-api-client-python-buzz-django/1.0',

4
samples/latitude/latitude.py
View File

@@ -51,7 +51,7 @@ def main():
http = httplib2.Http()
http = credentials.authorize(http)
p = build("latitude", "v1", http=http)
service = build("latitude", "v1", http=http)
body = {
"data": {
@@ -62,7 +62,7 @@ def main():
"altitude": 35
}
}
print p.currentLocation().insert(body=body).execute()
print service.currentLocation().insert(body=body).execute()
if __name__ == '__main__':
main()

6
samples/local/main.py
View File

@@ -29,9 +29,9 @@ DISCOVERY_URI = ('http://localhost:3990/discovery/v0.2beta1/describe/'
def main():
http = httplib2.Http()
p = build("buzz", "v1", http=http, discoveryServiceUrl=DISCOVERY_URI)
help(p.activities().list)
print p.activities().list(userId='@self', scope='@me', c='foo').uri
service = build("buzz", "v1", http=http, discoveryServiceUrl=DISCOVERY_URI)
help(service.activities().list)
print service.activities().list(userId='@self', scope='@me', c='foo').uri
if __name__ == '__main__':
main()

4
samples/localdiscovery/buzz.py
View File

@@ -55,12 +55,12 @@ def main():
f.close()
# Construct a service from the local documents
p = build_from_document(discovery,
service = build_from_document(discovery,
base="https://www.googleapis.com/",
future=future,
http=http,
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
activities = p.activities()
activities = service.activities()
try:
# Retrieve the first two activities

11
samples/moderator/moderator.py
View File

@@ -36,7 +36,6 @@ def main():
user_agent='python-moderator-sample/1.0',
domain='anonymous',
scope='https://www.googleapis.com/auth/moderator',
#scope='tag:google.com,2010:auth/moderator',
xoauth_displayname='Google API Client Example App')
credentials = run(flow, storage)
@@ -44,7 +43,7 @@ def main():
http = httplib2.Http()
http = credentials.authorize(http)
p = build('moderator', 'v1', http=http)
service = build('moderator', 'v1', http=http)
series_body = {
'description': 'Share and rank tips for eating healthy and cheap!',
@@ -52,7 +51,7 @@ def main():
'videoSubmissionAllowed': False
}
try:
series = p.series().insert(body=series_body).execute()
series = service.series().insert(body=series_body).execute()
print 'Created a new series'
topic_body = {
@@ -60,7 +59,7 @@ def main():
'name': 'Ideas',
'presenter': 'liz'
}
topic = p.topics().insert(seriesId=series['id']['seriesId'],
topic = service.topics().insert(seriesId=series['id']['seriesId'],
body=topic_body).execute()
print 'Created a new topic'
@@ -72,14 +71,14 @@ def main():
},
'text': 'Charlie Ayers @ Google'
}
submission = p.submissions().insert(seriesId=topic['id']['seriesId'],
submission = service.submissions().insert(seriesId=topic['id']['seriesId'],
topicId=topic['id']['topicId'], body=submission_body).execute()
print 'Inserted a new submisson on the topic'
vote_body = {
'vote': 'PLUS'
}
p.votes().insert(seriesId=topic['id']['seriesId'],
service.votes().insert(seriesId=topic['id']['seriesId'],
submissionId=submission['id']['submissionId'],
body=vote_body)
print 'Voted on the submission'

4
samples/oauth2/appengine/main.py
View File

@@ -67,8 +67,8 @@ class MainHandler(webapp.RequestHandler):
else:
http = httplib2.Http()
http = credentials.authorize(http)
p = build("buzz", "v1", http=http)
activities = p.activities()
service = build("buzz", "v1", http=http)
activities = service.activities()
activitylist = activities.list(scope='@consumption',
userId='@me').execute()
path = os.path.join(os.path.dirname(__file__), 'welcome.html')

6
samples/oauth2/buzz/buzz.py
View File

@@ -41,9 +41,9 @@ def main():
http = httplib2.Http()
http = credentials.authorize(http)
p = build("buzz", "v1", http=http,
service = build("buzz", "v1", http=http,
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
activities = p.activities()
activities = service.activities()
# Retrieve the first two activities
activitylist = activities.list(
@@ -78,7 +78,7 @@ def main():
}
}
item = activitylist['items'][0]
comment = p.comments().insert(
comment = service.comments().insert(
userId=item['actor']['id'], postId=item['id'], body=comment_body
).execute()
print 'Added a comment to the new activity'

4
samples/oauth2/django_sample/buzz/views.py
View File

@@ -37,8 +37,8 @@ def index(request):
else:
http = httplib2.Http()
http = credential.authorize(http)
p = build("buzz", "v1", http=http)
activities = p.activities()
service = build("buzz", "v1", http=http)
activities = service.activities()
activitylist = activities.list(scope='@consumption',
userId='@me').execute()
logging.info(activitylist)

4
samples/oauth2/latitude/latitude.py
View File

@@ -38,7 +38,7 @@ def main():
http = httplib2.Http()
http = credentials.authorize(http)
p = build("latitude", "v1", http=http)
service = build("latitude", "v1", http=http)
body = {
"data": {
@@ -50,7 +50,7 @@ def main():
}
}
try:
print p.currentLocation().insert(body=body).execute()
print service.currentLocation().insert(body=body).execute()
except CredentialsInvalidError:
print 'Your credentials are no longer valid.'
print 'Please re-run this application to re-authorize.'

10
samples/oauth2/moderator/moderator.py
View File

@@ -39,7 +39,7 @@ def main():
http = httplib2.Http()
http = credentials.authorize(http)
p = build("moderator", "v1", http=http)
service = build("moderator", "v1", http=http)
series_body = {
"data": {
@@ -48,7 +48,7 @@ def main():
"videoSubmissionAllowed": False
}
}
series = p.series().insert(body=series_body).execute()
series = service.series().insert(body=series_body).execute()
print "Created a new series"
topic_body = {
@@ -58,7 +58,7 @@ def main():
"presenter": "liz"
}
}
topic = p.topics().insert(seriesId=series['id']['seriesId'],
topic = service.topics().insert(seriesId=series['id']['seriesId'],
body=topic_body).execute()
print "Created a new topic"
@@ -72,7 +72,7 @@ def main():
"text": "Charlie Ayers @ Google"
}
}
submission = p.submissions().insert(seriesId=topic['id']['seriesId'],
submission = service.submissions().insert(seriesId=topic['id']['seriesId'],
topicId=topic['id']['topicId'], body=submission_body).execute()
print "Inserted a new submisson on the topic"
@@ -81,7 +81,7 @@ def main():
"vote": "PLUS"
}
}
p.votes().insert(seriesId=topic['id']['seriesId'],
service.votes().insert(seriesId=topic['id']['seriesId'],
submissionId=submission['id']['submissionId'],
body=vote_body)
print "Voted on the submission"

6
samples/threadqueue/main.py
View File

@@ -100,7 +100,7 @@ def main():
http = httplib2.Http()
http = credentials.authorize(http)
p = build("moderator", "v1", http=http)
service = build("moderator", "v1", http=http)
series_body = {
"data": {
@@ -110,7 +110,7 @@ def main():
}
}
try:
series = p.series().insert(body=series_body).execute()
series = service.series().insert(body=series_body).execute()
print "Created a new series"
for i in range(NUM_ITEMS):
@@ -121,7 +121,7 @@ def main():
"presenter": "me"
}
}
topic_request = p.topics().insert(seriesId=series['id']['seriesId'],
topic_request = service.topics().insert(seriesId=series['id']['seriesId'],
body=topic_body)
print "Adding request to queue"
queue.put(topic_request)

4
samples/translate/main.py
View File

@@ -21,9 +21,9 @@ import pprint
def main():
p = build('translate', 'v2',
service = build('translate', 'v2',
developerKey='AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0')
print p.translations().list(
print service.translations().list(
source='en',
target='fr',
q=['flower', 'car']