v201602 support for DFP

Author: Nicholas Chen

ChangeLog

@@ -1,3 +1,22 @@
+3.13.0 -- 2/23/2016
+* Added support for DFP v201602.
+* Removed support for DFP v201411.
+* Removed examples for DFP v201502.
+* The library now applies a temporary patch to the suds-jurko dependency that
+  resolves multiple issues. This patch will be removed when the suds-jurko
+  library publicly exposes its 0.7 release. Thanks to GitHub user adiharush for
+  suggesting the patch!
+* The LoadFromStorage function can now load credentials for either the
+  installed application or service account (.p12 files only) OAuth 2.0 flows.
+* The googleads.yaml configuration file has been updated to reflect the changes
+  to the LoadFromStorage function.
+* Resolved Issues:
+  Issue #58: https://github.com/googleads/googleads-python-lib/issues/58
+  Issue #62: https://github.com/googleads/googleads-python-lib/issues/62
+  Issue #63: https://github.com/googleads/googleads-python-lib/issues/63
+  Issue #68: https://github.com/googleads/googleads-python-lib/issues/68
+  Issue #78: https://github.com/googleads/googleads-python-lib/issues/78
+
 3.12.0 -- 02/01/2016
 * Removed DoubleClick Ad Exchange content. This API has been sunset.
 * Added support for AdWords v201601.
@@ -11,6 +30,7 @@
 * The AdWords BatchJobHelper and IncrementalUploadHelper utilities now
   initialize URLs for v201601 and up.
 * The AdWords IncrementalUploadHelper is now serializable.
+>>>>>>> a4bf1f889e4cecee17f2e27a10d593452904cb8b
 
 3.11.0 -- 11/24/2015
 * Removed support for AdWords v201502.

README.md

@@ -6,15 +6,6 @@ and DoubleClick for Publishers. The library provides easy ways to store your
 authentication and create SOAP web service clients. It also contains example
 code to help you get started integrating with our APIs.
 
-####Important Note Regarding DFP
-If you are using v201502 and newer in the DFP API, then performing actions on
-objects will fail with an 'args NULL' error due to a bug in the underlying SOAP
-client, more details here: https://github.com/googleads/googleads-python-lib/issues/58.
-
-While the fix has been accepted and merged into the source, you will need to download
-the source files yourself and install them directly. The source can be located here:
-https://bitbucket.org/jurko/suds/downloads
-
 ##How do I get started?
 ####Installing the library
 Install or update the library from PyPI. If you're using pip, this is as easy

examples/adwords/v201506/advanced_operations/find_and_remove_criteria_from_shared_set.py

@@ -106,7 +106,7 @@ def main(client, campaign_id):
 
   while page['totalNumEntries'] > offset:
     page = shared_criterion_service.get(selector)
-    if page['entries']:
+    if 'entries' in page:
       for shared_criterion in page['entries']:
         if shared_criterion['criterion']['type'] == 'KEYWORD':
           print ('Shared negative keyword with ID %d and text "%s" was'
@@ -129,21 +129,22 @@ def main(client, campaign_id):
     selector['paging']['startIndex'] = offset
 
   # Finally, remove the criteria.
-  operations = [
-      {
-          'operator': 'REMOVE',
-          'operand': {
-              'criterion': {'id': criterion['criterionId']},
-              'sharedSetId': criterion['sharedSetId']
-          }
-      } for criterion in criterion_ids
-  ]
-
-  response = shared_criterion_service.mutate(operations)
-  if 'value' in response:
-    for criterion in response['value']:
-      print ('Criterion ID %d was successfully removed from shared set ID'
-             '%d.' % (criterion['criterion']['id'], criterion['sharedSetId']))
+  if criterion_ids:
+    operations = [
+        {
+            'operator': 'REMOVE',
+            'operand': {
+                'criterion': {'id': criterion['criterionId']},
+                'sharedSetId': criterion['sharedSetId']
+            }
+        } for criterion in criterion_ids
+    ]
+
+    response = shared_criterion_service.mutate(operations)
+    if 'value' in response:
+      for criterion in response['value']:
+        print ('Criterion ID %d was successfully removed from shared set ID'
+               '%d.' % (criterion['criterion']['id'], criterion['sharedSetId']))
   else:
     print 'No shared criteria were removed.'
 

examples/adwords/v201509/advanced_operations/find_and_remove_criteria_from_shared_set.py

@@ -106,7 +106,7 @@ def main(client, campaign_id):
 
   while page['totalNumEntries'] > offset:
     page = shared_criterion_service.get(selector)
-    if page['entries']:
+    if 'entries' in page:
       for shared_criterion in page['entries']:
         if shared_criterion['criterion']['type'] == 'KEYWORD':
           print ('Shared negative keyword with ID %d and text "%s" was'
@@ -129,21 +129,22 @@ def main(client, campaign_id):
     selector['paging']['startIndex'] = offset
 
   # Finally, remove the criteria.
-  operations = [
-      {
-          'operator': 'REMOVE',
-          'operand': {
-              'criterion': {'id': criterion['criterionId']},
-              'sharedSetId': criterion['sharedSetId']
-          }
-      } for criterion in criterion_ids
-  ]
-
-  response = shared_criterion_service.mutate(operations)
-  if 'value' in response:
-    for criterion in response['value']:
-      print ('Criterion ID %d was successfully removed from shared set ID'
-             '%d.' % (criterion['criterion']['id'], criterion['sharedSetId']))
+  if criterion_ids:
+    operations = [
+        {
+            'operator': 'REMOVE',
+            'operand': {
+                'criterion': {'id': criterion['criterionId']},
+                'sharedSetId': criterion['sharedSetId']
+            }
+        } for criterion in criterion_ids
+    ]
+
+    response = shared_criterion_service.mutate(operations)
+    if 'value' in response:
+      for criterion in response['value']:
+        print ('Criterion ID %d was successfully removed from shared set ID'
+               '%d.' % (criterion['criterion']['id'], criterion['sharedSetId']))
   else:
     print 'No shared criteria were removed.'
 

examples/adwords/v201601/advanced_operations/find_and_remove_criteria_from_shared_set.py

@@ -106,7 +106,7 @@ def main(client, campaign_id):
 
   while page['totalNumEntries'] > offset:
     page = shared_criterion_service.get(selector)
-    if page['entries']:
+    if 'entries' in page:
       for shared_criterion in page['entries']:
         if shared_criterion['criterion']['type'] == 'KEYWORD':
           print ('Shared negative keyword with ID %d and text "%s" was'
@@ -129,21 +129,22 @@ def main(client, campaign_id):
     selector['paging']['startIndex'] = offset
 
   # Finally, remove the criteria.
-  operations = [
-      {
-          'operator': 'REMOVE',
-          'operand': {
-              'criterion': {'id': criterion['criterionId']},
-              'sharedSetId': criterion['sharedSetId']
-          }
-      } for criterion in criterion_ids
-  ]
-
-  response = shared_criterion_service.mutate(operations)
-  if 'value' in response:
-    for criterion in response['value']:
-      print ('Criterion ID %d was successfully removed from shared set ID'
-             '%d.' % (criterion['criterion']['id'], criterion['sharedSetId']))
+  if criterion_ids:
+    operations = [
+        {
+            'operator': 'REMOVE',
+            'operand': {
+                'criterion': {'id': criterion['criterionId']},
+                'sharedSetId': criterion['sharedSetId']
+            }
+        } for criterion in criterion_ids
+    ]
+
+    response = shared_criterion_service.mutate(operations)
+    if 'value' in response:
+      for criterion in response['value']:
+        print ('Criterion ID %d was successfully removed from shared set ID'
+               '%d.' % (criterion['criterion']['id'], criterion['sharedSetId']))
   else:
     print 'No shared criteria were removed.'
 

examples/dfp/v201502/activity_group_service/__init__.py renamed to examples/dfp/v201602/activity_group_service/__init__.py

@@ -38,7 +38,7 @@
 def main(client, advertiser_company_id):
   # Initialize appropriate service.
   activity_group_service = client.GetService('ActivityGroupService',
-                                             version='v201502')
+                                             version='v201602')
 
   # Create a short-term activity group.
   short_term_activity_group = {

examples/dfp/v201502/activity_group_service/create_activity_groups.py renamed to examples/dfp/v201602/activity_group_service/create_activity_groups.py

@@ -33,7 +33,7 @@
 def main(client):
   # Initialize appropriate service.
   activity_group_service = client.GetService('ActivityGroupService',
-                                             version='v201502')
+                                             version='v201602')
 
   # Create statement object to only select active activity groups.
   values = [{

examples/dfp/v201502/activity_group_service/get_active_activity_groups.py renamed to examples/dfp/v201602/activity_group_service/get_active_activity_groups.py

@@ -33,7 +33,7 @@
 def main(client):
   # Initialize appropriate service.
   activity_group_service = client.GetService('ActivityGroupService',
-                                             version='v201502')
+                                             version='v201602')
 
   # Create a filter statement.
   statement = dfp.FilterStatement()

examples/dfp/v201502/activity_group_service/get_all_activity_groups.py renamed to examples/dfp/v201602/activity_group_service/get_all_activity_groups.py

@@ -37,7 +37,7 @@
 def main(client, activity_group_id, advertiser_company_id):
   # Initialize appropriate service.
   activity_group_service = client.GetService('ActivityGroupService',
-                                             version='v201502')
+                                             version='v201602')
 
   # Create statement object to select a single activity groups by ID.
   values = [{