Added Ad Customieout.

Author: yufengg

ChangeLog

@@ -1,3 +1,8 @@
+2.0.2 - 09/03/2014
+=================
+* Added Ad Customizer example for AdWords.
+* Extend timeout on SUDs to correspond to access token expiry.
+
 2.0.1 - 08/20/2014
 =================
 * Added support for v201408 for DFP client library.

googleads/adwords.py

@@ -248,7 +248,7 @@ def GetService(self, service_name, version=sorted(_SERVICE_MAP.keys())[-1],
       client = suds.client.Client(
           self._SOAP_SERVICE_FORMAT %
           (server, _SERVICE_MAP[version][service_name], version, service_name),
-          proxy=proxy_option, cache=self.cache, timeout=600)
+          proxy=proxy_option, cache=self.cache, timeout=3600)
     except KeyError:
       if version in _SERVICE_MAP:
         raise googleads.errors.GoogleAdsValueError(

googleads/common.py

@@ -26,7 +26,7 @@
 import googleads.errors
 import googleads.oauth2
 
-VERSION = '2.0.1'
+VERSION = '2.0.2'
 _COMMON_LIB_SIG = 'googleads/%s' % VERSION
 _PYTHON_VERSION = 'Python/%d.%d' % (sys.version_info[0], sys.version_info[1])
 

googleads/dfa.py

@@ -142,7 +142,7 @@ def GetService(self, service_name, version=sorted(_SERVICE_MAP.keys())[-1],
 
       client = suds.client.Client(
           self._SOAP_SERVICE_FORMAT % (server, version, service_name),
-          proxy=proxy_option, cache=self.cache)
+          proxy=proxy_option, cache=self.cache, timeout=3600)
     except suds.transport.TransportError:
       if version in self._SERVICE_MAP:
         if service_name in self._SERVICE_MAP[version]:

googleads/dfp.py

@@ -206,7 +206,7 @@ def GetService(self, service_name, version=sorted(_SERVICE_MAP.keys())[-1],
 
       client = suds.client.Client(
           self._SOAP_SERVICE_FORMAT % (server, version, service_name),
-          proxy=proxy_option, cache=self.cache, timeout=600)
+          proxy=proxy_option, cache=self.cache, timeout=3600)
     except suds.transport.TransportError:
       if version in _SERVICE_MAP:
         if service_name in _SERVICE_MAP[version]:

tests/adwords_test.py

@@ -197,7 +197,7 @@ def testGetService_success(self):
       mock_client.assert_called_once_with(
           'https://testing.test.com/api/adwords/%s/%s/%s?wsdl'
           % (namespace, version, service), proxy=https_proxy, cache=self.cache,
-          timeout=600)
+          timeout=3600)
       self.assertIsInstance(suds_service, googleads.common.SudsServiceProxy)
 
     # Use the default server and https_proxy.
@@ -208,7 +208,7 @@ def testGetService_success(self):
       mock_client.assert_called_once_with(
           'https://adwords.google.com/api/adwords/%s/%s/%s?wsdl'
           % (namespace, version, service), proxy=None, cache=self.cache,
-          timeout=600)
+          timeout=3600)
       self.assertFalse(mock_client.return_value.set_options.called)
       self.assertIsInstance(suds_service, googleads.common.SudsServiceProxy)
 

tests/dfa_test.py

@@ -108,7 +108,8 @@ def testGetService_success(self):
 
       mock_client.assert_called_once_with(
           'https://testing.test.com/%s/api/dfa-api/%s?wsdl'
-          % (version, service), proxy=https_proxy, cache=self.cache)
+          % (version, service), proxy=https_proxy, cache=self.cache,
+          timeout=3600)
       self.assertIsInstance(suds_service, googleads.common.SudsServiceProxy)
 
     # Use the default server and https_proxy.
@@ -118,7 +119,7 @@ def testGetService_success(self):
 
       mock_client.assert_called_once_with(
           'https://advertisersapi.doubleclick.com/%s/api/dfa-api/%s?wsdl'
-          % (version, service), proxy=None, cache=self.cache)
+          % (version, service), proxy=None, cache=self.cache, timeout=3600)
       self.assertFalse(mock_client.return_value.set_options.called)
       self.assertIsInstance(suds_service, googleads.common.SudsServiceProxy)
 

tests/dfp_test.py

@@ -100,7 +100,7 @@ def testGetService_success(self):
       mock_client.assert_called_once_with(
           'https://testing.test.com/apis/ads/publisher/%s/%s?wsdl'
           % (self.version, service), proxy=https_proxy, cache=self.cache,
-          timeout=600)
+          timeout=3600)
       self.assertIsInstance(suds_service, googleads.common.SudsServiceProxy)
 
     # Use the default server and https proxy.
@@ -111,7 +111,7 @@ def testGetService_success(self):
       mock_client.assert_called_once_with(
           'https://ads.google.com/apis/ads/publisher/%s/%s?wsdl'
           % (self.version, service), proxy=None, cache=self.cache,
-          timeout=600)
+          timeout=3600)
       self.assertFalse(mock_client.return_value.set_options.called)
       self.assertIsInstance(suds_service, googleads.common.SudsServiceProxy)