"Fixing issue #55"

Author: Nicholas Chen

ChangeLog

@@ -1,6 +1,10 @@
+3.4.1 - 5/22/2015
+* Fixed issue #55
+* Fixed issue #57
+
 3.4.0 - 5/19/2015
-* Added support for v201505.
-* Removed examples for v201405.
+* Added support for DFP v201505.
+* Removed examples for DFP v201405.
 
 3.3.0 - 3/25/2015
 * Fixed issue #47.

examples/adwords/v201502/extensions/add_site_links_using_feeds.py

@@ -122,7 +122,7 @@ def main(client, campaign_id):
             },
             {
                 'feedAttributeId': sitelinks_data['finalUrlFeedId'],
-                'stringValue': item['finalUrls']
+                'stringValues': [item['finalUrls']]
             },
             {
                 'feedAttributeId': sitelinks_data['line1FeedId'],

googleads/adwords.py

@@ -586,7 +586,7 @@ def DownloadReportAsString(self, report_definition,
       response = self._DownloadReportAsStream(
           self._SerializeReportDefinition(report_definition),
           skip_report_header, skip_column_header, skip_report_summary)
-      return response.read().decode()
+      return response.read().decode('utf-8')
     finally:
       if response:
         response.close()
@@ -632,7 +632,7 @@ def DownloadReportAsStringWithAwql(self, query, file_format,
       response = self.DownloadReportAsStreamWithAwql(
           query, file_format, skip_report_header, skip_column_header,
           skip_report_summary)
-      return response.read().decode()
+      return response.read().decode('utf-8')
     finally:
       if response:
         response.close()

googleads/common.py

@@ -28,7 +28,7 @@
 import googleads.errors
 import googleads.oauth2
 
-VERSION = '3.4.0'
+VERSION = '3.4.1'
 _COMMON_LIB_SIG = 'googleads/%s' % VERSION
 _PROXY_YAML_KEY = 'proxy_info'
 _PYTHON_VERSION = 'Python/%d.%d' % (sys.version_info[0], sys.version_info[1])

tests/adwords_test.py

@@ -279,6 +279,61 @@ def testDownloadReport(self):
         self.header_handler.GetReportDownloadHeaders.assert_called_once_with(
             None, None, None)
 
+  def testDownloadReportAsString(self):
+    report_definition = {'table': 'campaigns',
+                         'downloadFormat': 'CSV'}
+    serialized_report = 'nuinbwuign'
+    post_body = urllib.urlencode({'__rdxml': serialized_report})
+    if not PYTHON2:
+      post_body = bytes(post_body, 'utf-8')
+    headers = {'Authorization': 'ya29.something'}
+    self.header_handler.GetReportDownloadHeaders.return_value = headers
+    content = u'CONTENT STRING アングリーバード'
+    fake_request = io.BytesIO()
+    fake_request.write(content.encode('utf-8') if PYTHON2
+                       else bytes(content, 'utf-8'))
+    fake_request.seek(0)
+    self.marshaller.process.return_value = serialized_report
+
+    with mock.patch('suds.mx.Content') as mock_content:
+      with mock.patch(URL_REQUEST_PATH + '.Request') as mock_request:
+        self.opener.open.return_value = fake_request
+        s = self.report_downloader.DownloadReportAsString(report_definition)
+        mock_request.assert_called_once_with(
+            ('https://adwords.google.com/api/adwords/reportdownload/%s'
+             % self.version), post_body, headers)
+        self.opener.open.assert_called_once_with(mock_request.return_value)
+        self.marshaller.process.assert_called_once_with(
+            mock_content.return_value)
+        self.assertEqual(content, s)
+        self.header_handler.GetReportDownloadHeaders.assert_called_once_with(
+            None, None, None)
+
+  def testDownloadReportAsStringWithAwql(self):
+    query = 'SELECT Id FROM Campaign WHERE NAME LIKE \'%Test%\''
+    file_format = 'CSV'
+    post_body = urllib.urlencode({'__fmt': file_format, '__rdquery': query})
+    if not PYTHON2:
+      post_body = bytes(post_body, 'utf-8')
+    headers = {'Authorization': 'ya29.something'}
+    self.header_handler.GetReportDownloadHeaders.return_value = headers
+    content = u'CONTENT STRING アングリーバード'
+    fake_request = io.BytesIO()
+    fake_request.write(content.encode('utf-8') if PYTHON2
+                       else bytes(content, 'utf-8'))
+    fake_request.seek(0)
+    with mock.patch(URL_REQUEST_PATH + '.Request') as mock_request:
+      self.opener.open.return_value = fake_request
+      s = self.report_downloader.DownloadReportAsStringWithAwql(query,
+                                                                file_format)
+      mock_request.assert_called_once_with(
+          ('https://adwords.google.com/api/adwords/reportdownload/%s'
+           % self.version), post_body, headers)
+      self.opener.open.assert_called_once_with(mock_request.return_value)
+    self.assertEqual(content, s)
+    self.header_handler.GetReportDownloadHeaders.assert_called_once_with(
+        None, None, None)
+
   def testDownloadReportCheckFormat_CSVStringSuccess(self):
     output_file = io.StringIO()
 
@@ -359,7 +414,7 @@ def testDownloadReportWithAwql(self):
       post_body = bytes(post_body, 'utf-8')
     headers = {'Authorization': 'ya29.something'}
     self.header_handler.GetReportDownloadHeaders.return_value = headers
-    content = u'CONTENT STRING'
+    content = u'CONTENT STRING 广告客户'
     fake_request = io.StringIO() if PYTHON2 else io.BytesIO()
     fake_request.write(content if PYTHON2 else bytes(content, 'utf-8'))
     fake_request.seek(0)