Merge pull request #189 from google/release-v1.5.0

Release v1.5.0

CHANGELOG

@@ -1,3 +1,14 @@
+v1.5.0
+  Version 1.5.0
+
+  Release to support oauth2client >= 2.0.0.
+
+  - Fix file stream recognition in Python 3 (#141)
+  - Fix non-resumable binary uploads in Python 3 (#147)
+  - Default to 'octet-stream' if mimetype detection fails (#157)
+  - Handle SSL errors with retries (#160)
+  - Fix incompatibility with oauth2client v2.0.0 (#182)
+
 v1.4.2
   Version 1.4.2
 

describe.py

@@ -33,6 +33,7 @@
 from googleapiclient.discovery import DISCOVERY_URI
 from googleapiclient.discovery import build
 from googleapiclient.discovery import build_from_document
+from googleapiclient.discovery import UnknownApiNameOrVersion
 import httplib2
 import uritemplate
 
@@ -339,7 +340,12 @@ def document_api(name, version):
     name: string, Name of the API.
     version: string, Version of the API.
   """
-  service = build(name, version)
+  try:
+    service = build(name, version)
+  except UnknownApiNameOrVersion as e:
+    print 'Warning: {} {} found but could not be built.'.format(name, version)
+    return
+
   response, content = http.request(
       uritemplate.expand(
           FLAGS.discovery_uri_template, {

docs/dyn/adexchangebuyer_v1_4.budget.html

@@ -97,7 +97,7 @@ <h3>Method Details</h3>
 
     { # The configuration data for Ad Exchange RTB - Budget API.
       "kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
-      "budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
+      "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.
       "currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
       "billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
       "id": "A String", # The unique id that describes this item.
@@ -117,7 +117,7 @@ <h3>Method Details</h3>
 
 { # The configuration data for Ad Exchange RTB - Budget API.
     "kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
-    "budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
+    "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.
     "currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
     "billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
     "id": "A String", # The unique id that describes this item.
@@ -130,7 +130,7 @@ <h3>Method Details</h3>
 
     { # The configuration data for Ad Exchange RTB - Budget API.
       "kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
-      "budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
+      "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.
       "currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
       "billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
       "id": "A String", # The unique id that describes this item.
@@ -150,7 +150,7 @@ <h3>Method Details</h3>
 
 { # The configuration data for Ad Exchange RTB - Budget API.
     "kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
-    "budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
+    "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.
     "currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
     "billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
     "id": "A String", # The unique id that describes this item.
@@ -163,7 +163,7 @@ <h3>Method Details</h3>
 
     { # The configuration data for Ad Exchange RTB - Budget API.
       "kind": "adexchangebuyer#budget", # The kind of the resource, i.e. "adexchangebuyer#budget".
-      "budgetAmount": "A String", # The budget amount to apply for the billingId provided. This is required for update requests.
+      "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.
       "currencyCode": "A String", # The currency code for the buyer. This cannot be altered here.
       "billingId": "A String", # The billing id to determine which adgroup to provide budget information for. This is required for get and update requests.
       "id": "A String", # The unique id that describes this item.

docs/dyn/adexchangebuyer_v1_4.creatives.html

@@ -74,6 +74,9 @@
 
 <h1><a href="adexchangebuyer_v1_4.html">Ad Exchange Buyer API</a> . <a href="adexchangebuyer_v1_4.creatives.html">creatives</a></h1>
 <h2>Instance Methods</h2>
+<p class="toc_element">
+  <code><a href="#addDeal">addDeal(accountId, buyerCreativeId, dealId)</a></code></p>
+<p class="firstline">Add a deal id association for the creative.</p>
 <p class="toc_element">
   <code><a href="#get">get(accountId, buyerCreativeId)</a></code></p>
 <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>
 <p class="toc_element">
   <code><a href="#list_next">list_next(previous_request, previous_response)</a></code></p>
 <p class="firstline">Retrieves the next page of results.</p>
+<p class="toc_element">
+  <code><a href="#removeDeal">removeDeal(accountId, buyerCreativeId, dealId)</a></code></p>
+<p class="firstline">Remove a deal id associated with the creative.</p>
 <h3>Method Details</h3>
+<div class="method">
+    <code class="details" id="addDeal">addDeal(accountId, buyerCreativeId, dealId)</code>
+  <pre>Add a deal id association for the creative.
+
+Args:
+  accountId: integer, The id for the account that will serve this creative. (required)
+  buyerCreativeId: string, The buyer-specific id for this creative. (required)
+  dealId: string, The id of the deal id to associate with this creative. (required)
+</pre>
+</div>
+
 <div class="method">
     <code class="details" id="get">get(accountId, buyerCreativeId)</code>
   <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>
   An object of the form:
 
     { # A creative and its classification data.
-      "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).
       "attribute": [ # All attributes for the ads that may be shown from this snippet.
         42,
       ],
@@ -146,6 +162,7 @@ <h3>Method Details</h3>
         "clickTrackingUrl": "A String", # The URL to use for click tracking.
       },
       "version": 42, # The version for this creative. Read-only. This field should not be set in requests.
+      "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).
       "vendorType": [ # All vendor types for the ads that may be shown from this snippet.
         42,
       ],
@@ -220,7 +237,6 @@ <h3>Method Details</h3>
     The object takes the form of:
 
 { # A creative and its classification data.
-    "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).
     "attribute": [ # All attributes for the ads that may be shown from this snippet.
       42,
     ],
@@ -267,6 +283,7 @@ <h3>Method Details</h3>
       "clickTrackingUrl": "A String", # The URL to use for click tracking.
     },
     "version": 42, # The version for this creative. Read-only. This field should not be set in requests.
+    "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).
     "vendorType": [ # All vendor types for the ads that may be shown from this snippet.
       42,
     ],
@@ -336,7 +353,6 @@ <h3>Method Details</h3>
   An object of the form:
 
     { # A creative and its classification data.
-      "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).
       "attribute": [ # All attributes for the ads that may be shown from this snippet.
         42,
       ],
@@ -383,6 +399,7 @@ <h3>Method Details</h3>
         "clickTrackingUrl": "A String", # The URL to use for click tracking.
       },
       "version": 42, # The version for this creative. Read-only. This field should not be set in requests.
+      "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).
       "vendorType": [ # All vendor types for the ads that may be shown from this snippet.
         42,
       ],
@@ -453,12 +470,12 @@ <h3>Method Details</h3>
   <pre>Retrieves a list of the authenticated user's active creatives. A creative will be available 30-40 minutes after submission.
 
 Args:
-  dealsStatusFilter: string, When specified, only creatives having the given direct deals status are returned.
+  dealsStatusFilter: string, When specified, only creatives having the given deals status are returned.
     Allowed values
-      approved - Creatives which have been approved for serving on direct deals.
-      conditionally_approved - Creatives which have been conditionally approved for serving on direct deals.
-      disapproved - Creatives which have been disapproved for serving on direct deals.
-      not_checked - Creatives whose direct deals status is not yet checked.
+      approved - Creatives which have been approved for serving on deals.
+      conditionally_approved - Creatives which have been conditionally approved for serving on deals.
+      disapproved - Creatives which have been disapproved for serving on deals.
+      not_checked - Creatives whose deals status is not yet checked.
   openAuctionStatusFilter: string, When specified, only creatives having the given open auction status are returned.
     Allowed values
       approved - Creatives which have been approved for serving on the open auction.
@@ -477,7 +494,6 @@ <h3>Method Details</h3>
     "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.
     "items": [ # A list of creatives.
       { # A creative and its classification data.
-          "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).
           "attribute": [ # All attributes for the ads that may be shown from this snippet.
             42,
           ],
@@ -524,6 +540,7 @@ <h3>Method Details</h3>
             "clickTrackingUrl": "A String", # The URL to use for click tracking.
           },
           "version": 42, # The version for this creative. Read-only. This field should not be set in requests.
+          "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).
           "vendorType": [ # All vendor types for the ads that may be shown from this snippet.
             42,
           ],
@@ -606,4 +623,15 @@ <h3>Method Details</h3>
     </pre>
 </div>
 
+<div class="method">
+    <code class="details" id="removeDeal">removeDeal(accountId, buyerCreativeId, dealId)</code>
+  <pre>Remove a deal id associated with the creative.
+
+Args:
+  accountId: integer, The id for the account that will serve this creative. (required)
+  buyerCreativeId: string, The buyer-specific id for this creative. (required)
+  dealId: string, The id of the deal id to disassociate with this creative. (required)
+</pre>
+</div>
+
 </body></html>

docs/dyn/adexchangebuyer_v1_4.html

@@ -89,21 +89,11 @@ <h2>Instance Methods</h2>
 </p>
 <p class="firstline">Returns the budget Resource.</p>
 
-<p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.clientaccess.html">clientaccess()</a></code>
-</p>
-<p class="firstline">Returns the clientaccess Resource.</p>
-
 <p class="toc_element">
   <code><a href="adexchangebuyer_v1_4.creatives.html">creatives()</a></code>
 </p>
 <p class="firstline">Returns the creatives Resource.</p>
 
-<p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.deals.html">deals()</a></code>
-</p>
-<p class="firstline">Returns the deals Resource.</p>
-
 <p class="toc_element">
   <code><a href="adexchangebuyer_v1_4.marketplacedeals.html">marketplacedeals()</a></code>
 </p>
@@ -115,39 +105,24 @@ <h2>Instance Methods</h2>
 <p class="firstline">Returns the marketplacenotes Resource.</p>
 
 <p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.marketplaceoffers.html">marketplaceoffers()</a></code>
-</p>
-<p class="firstline">Returns the marketplaceoffers Resource.</p>
-
-<p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.marketplaceorders.html">marketplaceorders()</a></code>
-</p>
-<p class="firstline">Returns the marketplaceorders Resource.</p>
-
-<p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.negotiationrounds.html">negotiationrounds()</a></code>
-</p>
-<p class="firstline">Returns the negotiationrounds Resource.</p>
-
-<p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.negotiations.html">negotiations()</a></code>
+  <code><a href="adexchangebuyer_v1_4.performanceReport.html">performanceReport()</a></code>
 </p>
-<p class="firstline">Returns the negotiations Resource.</p>
+<p class="firstline">Returns the performanceReport Resource.</p>
 
 <p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.offers.html">offers()</a></code>
+  <code><a href="adexchangebuyer_v1_4.pretargetingConfig.html">pretargetingConfig()</a></code>
 </p>
-<p class="firstline">Returns the offers Resource.</p>
+<p class="firstline">Returns the pretargetingConfig Resource.</p>
 
 <p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.performanceReport.html">performanceReport()</a></code>
+  <code><a href="adexchangebuyer_v1_4.products.html">products()</a></code>
 </p>
-<p class="firstline">Returns the performanceReport Resource.</p>
+<p class="firstline">Returns the products Resource.</p>
 
 <p class="toc_element">
-  <code><a href="adexchangebuyer_v1_4.pretargetingConfig.html">pretargetingConfig()</a></code>
+  <code><a href="adexchangebuyer_v1_4.proposals.html">proposals()</a></code>
 </p>
-<p class="firstline">Returns the pretargetingConfig Resource.</p>
+<p class="firstline">Returns the proposals Resource.</p>
 
 <p class="toc_element">
   <code><a href="#new_batch_http_request">new_batch_http_request()</a></code></p>