Removal of Python 2 support (#188)

ChangeLog

@@ -1,3 +1,6 @@
+* 4.0.0:
+- Removing support for Python 2
+
 * 3.3.0:
 - Google ads v2_2 release
 

README.rst

@@ -15,8 +15,8 @@ Features
 
 Requirements
 ------------
-* Python 2.7.13+ / 3.5.3+
-        - **NOTE:** Python 2 support will cease by the end of 2019. See this `blog post`_ for more detail.
+* Python 3.6.7+
+        - **NOTE:** Python 2 support has ceased as of v4.0. See this `blog post`_ for more detail.
 * `pip`_
 
 

examples/account_management/create_customer.py

@@ -20,10 +20,8 @@
 account.
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 from datetime import datetime
 
@@ -73,7 +71,7 @@ def main(client, manager_customer_id):
     parser = argparse.ArgumentParser(
         description=('Creates a new client under the given manager.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-m', '--manager_customer_id', type=six.text_type,
+    parser.add_argument('-m', '--manager_customer_id', type=str,
                         required=True, help='A Google Ads customer ID for the '
                         'manager account under which the new customer will '
                         'be created.')

examples/account_management/get_account_changes.py

@@ -16,12 +16,10 @@
 
 """This example gets the changes in the account made in the last 7 days."""
 
-from __future__ import absolute_import
 
 import argparse
 import sys
 
-import six
 
 import google.ads.google_ads.client
 
@@ -113,7 +111,7 @@ def main(client, customer_id):
   parser = argparse.ArgumentParser(
      description=('Displays account changes that occurred in the last 7 days.'))
   # The following argument(s) should be provided to run the example.
-  parser.add_argument('-c', '--customer_id', type=six.text_type,
+  parser.add_argument('-c', '--customer_id', type=str,
                       required=True, help='The Google Ads customer ID.')
   args = parser.parse_args()
 

examples/account_management/get_account_information.py

@@ -17,10 +17,8 @@
 For example, its name, currency, time zone, etc.
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 
 import google.ads.google_ads.client
@@ -61,7 +59,7 @@ def main(client, customer_id):
         description=('Displays basic information about the specified '
                      'customer\'s advertising account.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
     args = parser.parse_args()
 

examples/account_management/link_manager_to_client.py

@@ -14,10 +14,8 @@
 # limitations under the License.
 """This example shows how to link a manager customer to a client customer."""
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 import uuid
 from datetime import datetime, timedelta
@@ -104,9 +102,9 @@ def main(client, customer_id, manager_customer_id):
         description= ('Links and existing manager customer to an existing'
                       'client customer'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The customer ID.')
-    parser.add_argument('-m', '--manager_customer_id', type=six.text_type,
+    parser.add_argument('-m', '--manager_customer_id', type=str,
                         required=True, help='The manager customer ID.')
     args = parser.parse_args()
 

examples/account_management/list_accessible_customers.py

@@ -20,7 +20,6 @@
 documentation: https://developers.google.com/google-ads/api/docs/concepts/call-structure#login-customer-id
 """
 
-from __future__ import absolute_import
 
 import sys
 

examples/advanced_operations/add_ad_group_bid_modifier.py

@@ -17,10 +17,8 @@
 To get ad group bid modifiers, run get_ad_group_bid_modifiers.py
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 
 import google.ads.google_ads.client
@@ -77,9 +75,9 @@ def main(client, customer_id, ad_group_id, bid_modifier_value):
         description=('Adds an ad group bid modifier to the specified ad group '
                      'ID, for the given customer ID.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-a', '--ad_group_id', type=six.text_type,
+    parser.add_argument('-a', '--ad_group_id', type=str,
                         required=True, help='The ad group ID.')
     parser.add_argument('-b', '--bid_modifier_value', type=float,
                         required=False, default=1.5,

examples/advanced_operations/add_dynamic_page_feed.py

@@ -19,10 +19,8 @@
 campaigns run basic_operations/get_campaigns.py.
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 import uuid
 from datetime import datetime, timedelta
@@ -351,11 +349,11 @@ def add_dsa_targeting(client, customer_id, ad_group_resource_name, label):
         description= ('Adds a page feed with URLs for a Dynamic Search Ads '
                       'Campaign.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-i', '--campaign_id', type=six.text_type,
+    parser.add_argument('-i', '--campaign_id', type=str,
                         required=True, help='The campaign ID.')
-    parser.add_argument('-a', '--ad_group_id', type=six.text_type,
+    parser.add_argument('-a', '--ad_group_id', type=str,
                         required=True, help='The ad group ID.')
     args = parser.parse_args()
 

examples/advanced_operations/add_dynamic_search_ads_campaign.py

@@ -17,10 +17,8 @@
 To get campaigns, run basic_operations/get_campaigns.py
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 from uuid import uuid4
 from datetime import datetime, timedelta
@@ -266,7 +264,7 @@ def add_webpage_criteria(client, customer_id, ad_group_resource_name):
         description=('Adds a Dynamic Search Ad campaign under the specified '
                      'customer ID.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
     args = parser.parse_args()
 

examples/advanced_operations/add_expanded_text_ad_with_upgraded_urls.py

@@ -14,10 +14,8 @@
 # limitations under the License.
 """This adds an expanded text ad using advanced features of upgraded URLs."""
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 
 import google.ads.google_ads.client
@@ -102,9 +100,9 @@ def main(client, customer_id, ad_group_id):
         description=('Adds an expanded text ad to the specified ad group ID, '
                      'for the given customer ID.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-a', '--ad_group_id', type=six.text_type,
+    parser.add_argument('-a', '--ad_group_id', type=str,
                         required=True, help='The ad group ID.')
     args = parser.parse_args()
 

examples/advanced_operations/add_gmail_ad.py

@@ -18,10 +18,8 @@
 DISPLAY_GMAIL_AD. To get ad groups, run basic_operations/get_ad_groups.py
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 from uuid import uuid4
 import requests
@@ -124,9 +122,9 @@ def get_image(url):
         description=('Adds a gmail ad to the specified ad group ID, '
                      'for the given customer ID.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-a', '--ad_group_id', type=six.text_type,
+    parser.add_argument('-a', '--ad_group_id', type=str,
                         required=True, help='The ad group ID.')
     args = parser.parse_args()
 

examples/advanced_operations/add_sitelink.py

@@ -14,10 +14,8 @@
 # limitations under the License.
 """Demonstrates how to create a sitelink extension."""
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 
 from google.ads.google_ads.client import GoogleAdsClient
@@ -62,7 +60,7 @@ def main(client, customer_id):
     parser = argparse.ArgumentParser(
         description='Creates sitelink for the specified customer id')
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID')
     args = parser.parse_args()
 

examples/advanced_operations/create_and_attach_shared_keyword_set.py

@@ -17,10 +17,8 @@
 Note that the keywords will be attached to the specified campaign.
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 import uuid
 
@@ -123,9 +121,9 @@ def main(client, customer_id, campaign_id):
         description=('Adds a list of negative broad match keywords to the '
                      'provided campaign, for the specified customer.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-i', '--campaign_id', type=six.text_type,
+    parser.add_argument('-i', '--campaign_id', type=str,
                         required=True, help='The campaign ID.')
     args = parser.parse_args()
 

examples/advanced_operations/find_and_remove_criteria_from_shared_set.py

@@ -14,10 +14,8 @@
 # limitations under the License.
 """Demonstrates how to find and remove shared sets, and shared set criteria."""
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 
 import google.ads.google_ads.client
@@ -130,9 +128,9 @@ def main(client, customer_id, page_size, campaign_id):
         description=('Finds shared sets, then finds and removes shared set '
                      'criteria under them.'))
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-i', '--campaign_id', type=six.text_type,
+    parser.add_argument('-i', '--campaign_id', type=str,
                         required=True, help='The campaign ID.')
     args = parser.parse_args()
 

examples/advanced_operations/get_ad_group_bid_modifiers.py

@@ -14,10 +14,8 @@
 # limitations under the License.
 """This example illustrates how to retrieve ad group bid modifiers."""
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 import google.ads.google_ads.client
 
@@ -70,9 +68,9 @@ def main(client, customer_id, page_size, ad_group_id=None):
     parser = argparse.ArgumentParser(
         description='List ad group bid modifiers for specified customer.')
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-a', '--ad_group_id', type=six.text_type,
+    parser.add_argument('-a', '--ad_group_id', type=str,
                         required=False,
                         help=('The ad group ID. Specify this to list ad group '
                               'bid modifiers solely for this ad group ID.'))

examples/advanced_operations/use_portfolio_bidding_strategy.py

@@ -14,10 +14,8 @@
 # limitations under the License.
 """This example constructs a campaign with a Portfolio Bidding Strategy."""
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 import uuid
 
@@ -137,7 +135,7 @@ def main(client, customer_id):
     parser = argparse.ArgumentParser(
         description='Adds a campaign for specified customer.')
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
     args = parser.parse_args()
 

examples/authentication/authenticate_in_standalone_application.py

@@ -20,7 +20,6 @@
 It is intended to be run from the command line and requires user input.
 """
 
-from __future__ import absolute_import
 
 import argparse
 

examples/authentication/authenticate_in_web_application.py

@@ -20,7 +20,6 @@
 It is intended to be run from the command line and requires user input.
 """
 
-from __future__ import absolute_import
 
 import argparse
 

examples/basic_operations/add_ad_groups.py

@@ -17,10 +17,8 @@
 To get ad groups, run get_ad_groups.py.
 """
 
-from __future__ import absolute_import
 
 import argparse
-import six
 import sys
 import uuid
 
@@ -68,9 +66,9 @@ def main(client, customer_id, campaign_id):
     parser = argparse.ArgumentParser(
         description='Adds an ad group for specified customer and campaign id.')
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
-    parser.add_argument('-i', '--campaign_id', type=six.text_type,
+    parser.add_argument('-i', '--campaign_id', type=str,
                         required=True, help='The campaign ID.')
     args = parser.parse_args()
 

examples/basic_operations/add_campaigns.py

@@ -17,11 +17,9 @@
 To get campaigns, run get_campaigns.py.
 """
 
-from __future__ import absolute_import
 
 import argparse
 import datetime
-import six
 import sys
 import uuid
 
@@ -118,7 +116,7 @@ def main(client, customer_id):
     parser = argparse.ArgumentParser(
         description='Adds a campaign for specified customer.')
     # The following argument(s) should be provided to run the example.
-    parser.add_argument('-c', '--customer_id', type=six.text_type,
+    parser.add_argument('-c', '--customer_id', type=str,
                         required=True, help='The Google Ads customer ID.')
     args = parser.parse_args()