Adding support for AdWords v201509.

Author: msaniscalchi

ChangeLog

@@ -1,3 +1,15 @@
+3.8.0 - 10/7/2015
+* Added support for AdWords v201509.
+* Replaced references to MCC accounts with AdWords manager accounts.
+* Added upload_media_bundle as a new misc example for AdWords v201509.
+* Added add_html5_ad as a new advanced_operations example for AdWords v201509.
+* Added add_crm_based_user_list as a new remarketing example for AdWords
+  v201509.
+
+3.7.1 - 9/4/2015
+* Fixed issue #68.
+* Updated the get_keywords AdWords sample.
+
 3.7.0 - 8/20/2015
 * Update ServiceAccount constructor to open p12 file in binary mode.
 * Added support for v201508 for the Doubleclick for Publishers Client Library.

examples/adwords/adwords_appengine_demo/README

@@ -11,7 +11,7 @@ to build and host web applications.
 In order for the web application to communicate with AdWords API, we will use
 the [Google Ads Python Client Library](https://github.com/googleads/googleads-python-lib).
 
-In this demo, a user signs in and provides their MCC Client Customer Id and
+In this demo, a user signs in and provides their AdWords manager account id and
 other credentials that are used to access the AdWords API and provide the
 following functionality:
 

examples/adwords/adwords_appengine_demo/handlers/api_handler.py

@@ -31,21 +31,21 @@ class APIHandler(object):
   # The user-agent sent in requests from this demo.
   _USER_AGENT = 'AppEngine Googleads Demo v%s' % VERSION
 
-  def __init__(self, client_id, client_secret, refresh_token, mcc_cid,
-               dev_token):
+  def __init__(self, client_id, client_secret, refresh_token,
+               manager_account_id, dev_token):
     """Initializes an APIHandler.
 
     Args:
       client_id: The client customer id retrieved from the Developers Console.
       client_secret: The client secret retrieved from the Developers Console.
       refresh_token: The refresh token retrieved with generate_refresh_token.py.
-      mcc_cid: The AdWords MCC Account Client Customer Id.
+      manager_account_id: The AdWords manager account Id.
       dev_token: The AdWords Developer Token.
     """
     credentials = GoogleRefreshTokenClient(client_id, client_secret,
                                            refresh_token)
     self.client = AdWordsClient(dev_token, credentials, self._USER_AGENT,
-                                mcc_cid)
+                                manager_account_id)
 
   def AddAdGroup(self, client_customer_id, campaign_id, name, status):
     """Create a new ad group.
@@ -133,7 +133,7 @@ def AddCampaign(self, client_customer_id, campaign_name, ad_channel_type,
     campaign_service.mutate(operations)
 
   def GetAccounts(self):
-    """Return the client accounts associated with the user's MCC account.
+    """Return the client accounts associated with the user's manager account.
 
     Returns:
       list List of ManagedCustomer data objects.

examples/adwords/adwords_appengine_demo/handlers/ndb_handler.py

@@ -42,23 +42,23 @@ def InitUser():
   return app_user
 
 
-def UpdateUserCredentials(client_id, client_secret, refresh_token, mcc_cid,
-                          developer_token):
+def UpdateUserCredentials(client_id, client_secret, refresh_token,
+                          manager_account_id, developer_token):
   """Update the credentials associated with application user.
 
   Args:
     client_id: str Client Id retrieved from the developer's console.
     client_secret: str Client Secret retrieved from the developer's console.
     refresh_token: str Refresh token generated with the above client id/secret.
-    mcc_cid: str Customer Id for the AdWords MCC account.
+    manager_account_id: str Customer Id for the AdWords manager account.
     developer_token: str Developer Token for the AdWords account.
   """
   app_user = AppUser.query(AppUser.user == users.get_current_user()).fetch()[0]
 
   app_user.client_id = client_id
   app_user.client_secret = client_secret
   app_user.refresh_token = refresh_token
-  app_user.mcc_cid = mcc_cid
+  app_user.manager_account_id = manager_account_id
   app_user.developer_token = developer_token
 
   app_user.put()

examples/adwords/adwords_appengine_demo/models/app_user.py

@@ -32,5 +32,5 @@ class AppUser(ndb.Model):
   client_id = ndb.StringProperty(required=False)
   client_secret = ndb.StringProperty(required=False)
   refresh_token = ndb.StringProperty(required=False)
-  mcc_cid = ndb.StringProperty(required=False)
+  adwords_manager_cid = ndb.StringProperty(required=False)
   developer_token = ndb.StringProperty(required=False)

examples/adwords/adwords_appengine_demo/templates/show_credentials.html

@@ -23,9 +23,9 @@
                    value="{{ refresh_token }}"/></td>
       </tr>
       <tr>
-        <th><label for="mcc_cid">MCC Customer Id: </label></th>
-        <td><input type="text" name="mcc_cid" size="35"
-                   value="{{ mcc_cid }}"/></td>
+        <th><label for="adwords_manager_cid">AdWords Manager Account Id: </label></th>
+        <td><input type="text" name="manager_account_id" size="35"
+                   value="{{ manager_account_id }}"/></td>
       </tr>
       <tr>
       <th><label for="dev_token">Developer Token: </label></th>

examples/adwords/adwords_appengine_demo/views/add_adgroup_view.py

@@ -49,7 +49,7 @@ def post(self):
       handler = APIHandler(app_user.client_id,
                            app_user.client_secret,
                            app_user.refresh_token,
-                           app_user.mcc_cid,
+                           app_user.adwords_manager_cid,
                            app_user.developer_token)
 
       # Create new ad group.

examples/adwords/adwords_appengine_demo/views/add_campaign_view.py

@@ -49,7 +49,7 @@ def post(self):
       handler = APIHandler(app_user.client_id,
                            app_user.client_secret,
                            app_user.refresh_token,
-                           app_user.mcc_cid,
+                           app_user.adwords_manager_cid,
                            app_user.developer_token)
 
       # Create new campaign.

examples/adwords/adwords_appengine_demo/views/init_view.py

@@ -32,7 +32,7 @@ def get(self):
       app_user = InitUser()
 
       if (app_user.client_id and app_user.client_secret and
-          app_user.mcc_cid and app_user.developer_token and
+          app_user.adwords_manager_cid and app_user.developer_token and
           app_user.refresh_token):
         self.redirect('/showAccounts')
       else:

examples/adwords/adwords_appengine_demo/views/show_accounts_view.py

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Handles request to view accounts associated with MCC Cluent Customer Id."""
+"""Handles request to view accounts associated with manager account Id."""
 
 
 import os
@@ -28,7 +28,7 @@
 
 
 class ShowAccounts(webapp2.RequestHandler):
-  """View showing the client accounts for a given MCC Client Customer Id."""
+  """View showing the client accounts for a given manager account Id."""
 
   def get(self):
     """Handle get request."""
@@ -46,7 +46,7 @@ def get(self):
         handler = APIHandler(app_user.client_id,
                              app_user.client_secret,
                              app_user.refresh_token,
-                             app_user.mcc_cid,
+                             app_user.adwords_manager_cid,
                              app_user.developer_token)
 
         # Fetch account info for each client account and place in template.