Skip to content

Commit 1ae3e74

Browse files
committed
Updated all samples to use 'service' as the object returned from build()
1 parent f863f7a commit 1ae3e74

18 files changed

Lines changed: 49 additions & 46 deletions

File tree

apiclient/discovery.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ def createMethod(theclass, methodName, methodDesc, futureDesc):
239239
methodDesc['parameters']['body'] = {
240240
'description': 'The request body.',
241241
'type': 'object',
242+
'required': True,
242243
}
243244

244245
argmap = {} # Map from method parameter name to query parameter name

apiclient/ext/django_orm.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
from django.db import models
1+
import apiclient
2+
import base64
3+
import pickle
24

5+
from django.db import models
36

47
class OAuthCredentialsField(models.Field):
58

samples/appengine/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ def get(self):
5353
if c:
5454
http = httplib2.Http()
5555
http = c.credentials.authorize(http)
56-
p = build("buzz", "v1", http=http)
57-
activities = p.activities()
56+
service = build("buzz", "v1", http=http)
57+
activities = service.activities()
5858
activitylist = activities.list(scope='@consumption',
5959
userId='@me').execute()
6060
logging.info(activitylist)

samples/buzz/buzz.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ def main():
4343
http = httplib2.Http()
4444
http = credentials.authorize(http)
4545

46-
p = build("buzz", "v1", http=http,
46+
service = build("buzz", "v1", http=http,
4747
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
48-
activities = p.activities()
48+
activities = service.activities()
4949

5050
try:
5151
# Retrieve the first two activities
@@ -82,7 +82,7 @@ def main():
8282
}
8383
}
8484
item = activitylist['items'][0]
85-
comment = p.comments().insert(
85+
comment = service.comments().insert(
8686
userId=item['actor']['id'], postId=item['id'], body=comment_body
8787
).execute()
8888
print 'Added a comment to the new activity'

samples/customsearch/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020

2121
def main():
22-
p = build("customsearch", "v1",
22+
service = build("customsearch", "v1",
2323
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
24-
res = p.cse().list(
24+
res = service.cse().list(
2525
q='lectures',
2626
cx='017576662512468239146:omuauf_lfve',
2727
).execute()

samples/diacritize/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323

2424
def main():
25-
p = build("diacritize", "v1",
25+
service = build("diacritize", "v1",
2626
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
27-
print p.diacritize().corpus().get(
27+
print service.diacritize().corpus().get(
2828
lang='ar',
2929
last_letter='false',
3030
message=u'مثال لتشكيل'

samples/django_sample/buzz/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def index(request):
2020
c = Credential.objects.get(id=request.user)
2121
http = httplib2.Http()
2222
http = c.credential.authorize(http)
23-
p = build("buzz", "v1", http=http)
24-
activities = p.activities()
23+
service = build("buzz", "v1", http=http)
24+
activities = service.activities()
2525
activitylist = activities.list(scope='@consumption',
2626
userId='@me').execute()
2727
logging.info(activitylist)
@@ -31,8 +31,8 @@ def index(request):
3131
})
3232

3333
except Credential.DoesNotExist:
34-
p = build("buzz", "v1")
35-
flow = FlowThreeLegged(p.auth_discovery(),
34+
service = build("buzz", "v1")
35+
flow = FlowThreeLegged(service.auth_discovery(),
3636
consumer_key='anonymous',
3737
consumer_secret='anonymous',
3838
user_agent='google-api-client-python-buzz-django/1.0',

samples/latitude/latitude.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def main():
5151
http = httplib2.Http()
5252
http = credentials.authorize(http)
5353

54-
p = build("latitude", "v1", http=http)
54+
service = build("latitude", "v1", http=http)
5555

5656
body = {
5757
"data": {
@@ -62,7 +62,7 @@ def main():
6262
"altitude": 35
6363
}
6464
}
65-
print p.currentLocation().insert(body=body).execute()
65+
print service.currentLocation().insert(body=body).execute()
6666

6767
if __name__ == '__main__':
6868
main()

samples/local/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
def main():
3030
http = httplib2.Http()
3131

32-
p = build("buzz", "v1", http=http, discoveryServiceUrl=DISCOVERY_URI)
33-
help(p.activities().list)
34-
print p.activities().list(userId='@self', scope='@me', c='foo').uri
32+
service = build("buzz", "v1", http=http, discoveryServiceUrl=DISCOVERY_URI)
33+
help(service.activities().list)
34+
print service.activities().list(userId='@self', scope='@me', c='foo').uri
3535

3636
if __name__ == '__main__':
3737
main()

samples/localdiscovery/buzz.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ def main():
5555
f.close()
5656

5757
# Construct a service from the local documents
58-
p = build_from_document(discovery,
58+
service = build_from_document(discovery,
5959
base="https://www.googleapis.com/",
6060
future=future,
6161
http=http,
6262
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
63-
activities = p.activities()
63+
activities = service.activities()
6464

6565
try:
6666
# Retrieve the first two activities

0 commit comments

Comments
 (0)