Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e2fd7cb

Browse files
author
Jon Wayne Parrott
committed
Merge pull request googleapis#189 from google/release-v1.5.0
Release v1.5.0
2 parents 54b203a + da3e689 commit e2fd7cb

File tree

459 files changed

+61530
-10985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

459 files changed

+61530
-10985
lines changed

‎CHANGELOG

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
v1.5.0
2+
Version 1.5.0
3+
4+
Release to support oauth2client >= 2.0.0.
5+
6+
- Fix file stream recognition in Python 3 (#141)
7+
- Fix non-resumable binary uploads in Python 3 (#147)
8+
- Default to 'octet-stream' if mimetype detection fails (#157)
9+
- Handle SSL errors with retries (#160)
10+
- Fix incompatibility with oauth2client v2.0.0 (#182)
11+
112
v1.4.2
213
Version 1.4.2
314

‎describe.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
from googleapiclient.discovery import DISCOVERY_URI
3434
from googleapiclient.discovery import build
3535
from googleapiclient.discovery import build_from_document
36+
from googleapiclient.discovery import UnknownApiNameOrVersion
3637
import httplib2
3738
import uritemplate
3839

@@ -339,7 +340,12 @@ def document_api(name, version):
339340
name: string, Name of the API.
340341
version: string, Version of the API.
341342
"""
342-
service = build(name, version)
343+
try:
344+
service = build(name, version)
345+
except UnknownApiNameOrVersion as e:
346+
print 'Warning: {} {} found but could not be built.'.format(name, version)
347+
return
348+
343349
response, content = http.request(
344350
uritemplate.expand(
345351
FLAGS.discovery_uri_template, {

‎docs/dyn/adexchangebuyer_v1_4.budget.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ <h3>Method Details</h3>
9797

9898
{ # The configuration data for Ad Exchange RTB - Budget API.
9999
"kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
100-
"budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
100+
"budgetAmount": "A String", # The daily budget amount in unit amount of the account currency to apply for the billingId provided. This is required for update requests.
101101
"currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
102102
"billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
103103
"id": "A String", # The unique id that describes this item.
@@ -117,7 +117,7 @@ <h3>Method Details</h3>
117117

118118
{ # The configuration data for Ad Exchange RTB - Budget API.
119119
"kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
120-
"budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
120+
"budgetAmount": "A String", # The daily budget amount in unit amount of the account currency to apply for the billingId provided. This is required for update requests.
121121
"currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
122122
"billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
123123
"id": "A String", # The unique id that describes this item.
@@ -130,7 +130,7 @@ <h3>Method Details</h3>
130130

131131
{ # The configuration data for Ad Exchange RTB - Budget API.
132132
"kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
133-
"budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
133+
"budgetAmount": "A String", # The daily budget amount in unit amount of the account currency to apply for the billingId provided. This is required for update requests.
134134
"currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
135135
"billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
136136
"id": "A String", # The unique id that describes this item.
@@ -150,7 +150,7 @@ <h3>Method Details</h3>
150150

151151
{ # The configuration data for Ad Exchange RTB - Budget API.
152152
"kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
153-
"budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
153+
"budgetAmount": "A String", # The daily budget amount in unit amount of the account currency to apply for the billingId provided. This is required for update requests.
154154
"currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
155155
"billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
156156
"id": "A String", # The unique id that describes this item.
@@ -163,7 +163,7 @@ <h3>Method Details</h3>
163163

164164
{ # The configuration data for Ad Exchange RTB - Budget API.
165165
"kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
166-
"budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
166+
"budgetAmount": "A String", # The daily budget amount in unit amount of the account currency to apply for the billingId provided. This is required for update requests.
167167
"currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
168168
"billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
169169
"id": "A String", # The unique id that describes this item.

‎docs/dyn/adexchangebuyer_v1_4.creatives.html

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@
7474

7575
<h1><a href="adexchangebuyer_v1_4.html">Ad Exchange Buyer API</a> . <a href="adexchangebuyer_v1_4.creatives.html">creatives</a></h1>
7676
<h2>Instance Methods</h2>
77+
<p class="toc_element">
78+
<code><a href="#addDeal">addDeal(accountId, buyerCreativeId, dealId)</a></code></p>
79+
<p class="firstline">Add a deal id association for the creative.</p>
7780
<p class="toc_element">
7881
<code><a href="#get">get(accountId, buyerCreativeId)</a></code></p>
7982
<p class="firstline">Gets the status for a single creative. A creative will be available 30-40 minutes after submission.</p>
@@ -86,7 +89,21 @@ <h2>Instance Methods</h2>
8689
<p class="toc_element">
8790
<code><a href="#list_next">list_next(previous_request, previous_response)</a></code></p>
8891
<p class="firstline">Retrieves the next page of results.</p>
92+
<p class="toc_element">
93+
<code><a href="#removeDeal">removeDeal(accountId, buyerCreativeId, dealId)</a></code></p>
94+
<p class="firstline">Remove a deal id associated with the creative.</p>
8995
<h3>Method Details</h3>
96+
<div class="method">
97+
<code class="details" id="addDeal">addDeal(accountId, buyerCreativeId, dealId)</code>
98+
<pre>Add a deal id association for the creative.
99+
100+
Args:
101+
accountId: integer, The id for the account that will serve this creative. (required)
102+
buyerCreativeId: string, The buyer-specific id for this creative. (required)
103+
dealId: string, The id of the deal id to associate with this creative. (required)
104+
</pre>
105+
</div>
106+
90107
<div class="method">
91108
<code class="details" id="get">get(accountId, buyerCreativeId)</code>
92109
<pre>Gets the status for a single creative. A creative will be available 30-40 minutes after submission.
@@ -99,7 +116,6 @@ <h3>Method Details</h3>
99116
An object of the form:
100117

101118
{ # A creative and its classification data.
102-
"api_upload_timestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
103119
"attribute": [ # All attributes for the ads that may be shown from this snippet.
104120
42,
105121
],
@@ -146,6 +162,7 @@ <h3>Method Details</h3>
146162
"clickTrackingUrl": "A String", # The URL to use for click tracking.
147163
},
148164
"version": 42, # The version for this creative. Read-only. This field should not be set in requests.
165+
"apiUploadTimestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
149166
"vendorType": [ # All vendor types for the ads that may be shown from this snippet.
150167
42,
151168
],
@@ -220,7 +237,6 @@ <h3>Method Details</h3>
220237
The object takes the form of:
221238

222239
{ # A creative and its classification data.
223-
"api_upload_timestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
224240
"attribute": [ # All attributes for the ads that may be shown from this snippet.
225241
42,
226242
],
@@ -267,6 +283,7 @@ <h3>Method Details</h3>
267283
"clickTrackingUrl": "A String", # The URL to use for click tracking.
268284
},
269285
"version": 42, # The version for this creative. Read-only. This field should not be set in requests.
286+
"apiUploadTimestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
270287
"vendorType": [ # All vendor types for the ads that may be shown from this snippet.
271288
42,
272289
],
@@ -336,7 +353,6 @@ <h3>Method Details</h3>
336353
An object of the form:
337354

338355
{ # A creative and its classification data.
339-
"api_upload_timestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
340356
"attribute": [ # All attributes for the ads that may be shown from this snippet.
341357
42,
342358
],
@@ -383,6 +399,7 @@ <h3>Method Details</h3>
383399
"clickTrackingUrl": "A String", # The URL to use for click tracking.
384400
},
385401
"version": 42, # The version for this creative. Read-only. This field should not be set in requests.
402+
"apiUploadTimestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
386403
"vendorType": [ # All vendor types for the ads that may be shown from this snippet.
387404
42,
388405
],
@@ -453,12 +470,12 @@ <h3>Method Details</h3>
453470
<pre>Retrieves a list of the authenticated user's active creatives. A creative will be available 30-40 minutes after submission.
454471

455472
Args:
456-
dealsStatusFilter: string, When specified, only creatives having the given direct deals status are returned.
473+
dealsStatusFilter: string, When specified, only creatives having the given deals status are returned.
457474
Allowed values
458-
approved - Creatives which have been approved for serving on direct deals.
459-
conditionally_approved - Creatives which have been conditionally approved for serving on direct deals.
460-
disapproved - Creatives which have been disapproved for serving on direct deals.
461-
not_checked - Creatives whose direct deals status is not yet checked.
475+
approved - Creatives which have been approved for serving on deals.
476+
conditionally_approved - Creatives which have been conditionally approved for serving on deals.
477+
disapproved - Creatives which have been disapproved for serving on deals.
478+
not_checked - Creatives whose deals status is not yet checked.
462479
openAuctionStatusFilter: string, When specified, only creatives having the given open auction status are returned.
463480
Allowed values
464481
approved - Creatives which have been approved for serving on the open auction.
@@ -477,7 +494,6 @@ <h3>Method Details</h3>
477494
"nextPageToken": "A String", # Continuation token used to page through creatives. To retrieve the next page of results, set the next request's "pageToken" value to this.
478495
"items": [ # A list of creatives.
479496
{ # A creative and its classification data.
480-
"api_upload_timestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
481497
"attribute": [ # All attributes for the ads that may be shown from this snippet.
482498
42,
483499
],
@@ -524,6 +540,7 @@ <h3>Method Details</h3>
524540
"clickTrackingUrl": "A String", # The URL to use for click tracking.
525541
},
526542
"version": 42, # The version for this creative. Read-only. This field should not be set in requests.
543+
"apiUploadTimestamp": "A String", # The last upload timestamp of this creative if it was uploaded via API. Read-only. The value of this field is generated, and will be ignored for uploads. (formatted RFC 3339 timestamp).
527544
"vendorType": [ # All vendor types for the ads that may be shown from this snippet.
528545
42,
529546
],
@@ -606,4 +623,15 @@ <h3>Method Details</h3>
606623
</pre>
607624
</div>
608625

626+
<div class="method">
627+
<code class="details" id="removeDeal">removeDeal(accountId, buyerCreativeId, dealId)</code>
628+
<pre>Remove a deal id associated with the creative.
629+
630+
Args:
631+
accountId: integer, The id for the account that will serve this creative. (required)
632+
buyerCreativeId: string, The buyer-specific id for this creative. (required)
633+
dealId: string, The id of the deal id to disassociate with this creative. (required)
634+
</pre>
635+
</div>
636+
609637
</body></html>

‎docs/dyn/adexchangebuyer_v1_4.html

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,11 @@ <h2>Instance Methods</h2>
8989
</p>
9090
<p class="firstline">Returns the budget Resource.</p>
9191

92-
<p class="toc_element">
93-
<code><a href="adexchangebuyer_v1_4.clientaccess.html">clientaccess()</a></code>
94-
</p>
95-
<p class="firstline">Returns the clientaccess Resource.</p>
96-
9792
<p class="toc_element">
9893
<code><a href="adexchangebuyer_v1_4.creatives.html">creatives()</a></code>
9994
</p>
10095
<p class="firstline">Returns the creatives Resource.</p>
10196

102-
<p class="toc_element">
103-
<code><a href="adexchangebuyer_v1_4.deals.html">deals()</a></code>
104-
</p>
105-
<p class="firstline">Returns the deals Resource.</p>
106-
10797
<p class="toc_element">
10898
<code><a href="adexchangebuyer_v1_4.marketplacedeals.html">marketplacedeals()</a></code>
10999
</p>
@@ -115,39 +105,24 @@ <h2>Instance Methods</h2>
115105
<p class="firstline">Returns the marketplacenotes Resource.</p>
116106

117107
<p class="toc_element">
118-
<code><a href="adexchangebuyer_v1_4.marketplaceoffers.html">marketplaceoffers()</a></code>
119-
</p>
120-
<p class="firstline">Returns the marketplaceoffers Resource.</p>
121-
122-
<p class="toc_element">
123-
<code><a href="adexchangebuyer_v1_4.marketplaceorders.html">marketplaceorders()</a></code>
124-
</p>
125-
<p class="firstline">Returns the marketplaceorders Resource.</p>
126-
127-
<p class="toc_element">
128-
<code><a href="adexchangebuyer_v1_4.negotiationrounds.html">negotiationrounds()</a></code>
129-
</p>
130-
<p class="firstline">Returns the negotiationrounds Resource.</p>
131-
132-
<p class="toc_element">
133-
<code><a href="adexchangebuyer_v1_4.negotiations.html">negotiations()</a></code>
108+
<code><a href="adexchangebuyer_v1_4.performanceReport.html">performanceReport()</a></code>
134109
</p>
135-
<p class="firstline">Returns the negotiations Resource.</p>
110+
<p class="firstline">Returns the performanceReport Resource.</p>
136111

137112
<p class="toc_element">
138-
<code><a href="adexchangebuyer_v1_4.offers.html">offers()</a></code>
113+
<code><a href="adexchangebuyer_v1_4.pretargetingConfig.html">pretargetingConfig()</a></code>
139114
</p>
140-
<p class="firstline">Returns the offers Resource.</p>
115+
<p class="firstline">Returns the pretargetingConfig Resource.</p>
141116

142117
<p class="toc_element">
143-
<code><a href="adexchangebuyer_v1_4.performanceReport.html">performanceReport()</a></code>
118+
<code><a href="adexchangebuyer_v1_4.products.html">products()</a></code>
144119
</p>
145-
<p class="firstline">Returns the performanceReport Resource.</p>
120+
<p class="firstline">Returns the products Resource.</p>
146121

147122
<p class="toc_element">
148-
<code><a href="adexchangebuyer_v1_4.pretargetingConfig.html">pretargetingConfig()</a></code>
123+
<code><a href="adexchangebuyer_v1_4.proposals.html">proposals()</a></code>
149124
</p>
150-
<p class="firstline">Returns the pretargetingConfig Resource.</p>
125+
<p class="firstline">Returns the proposals Resource.</p>
151126

152127
<p class="toc_element">
153128
<code><a href="#new_batch_http_request">new_batch_http_request()</a></code></p>

0 commit comments

Comments
 (0)