Merge pull request #2520 from daspecster/fix-encoding-speech-bug-2519

daspecster · web-flow · commit b4c98cc95602 · 2016-10-11T09:22:56.000-04:00
Speech Python 3.5 encoding content - 'not JSON serializable'
diff --git a/google-cloud-speech/google/cloud/speech/client.py b/google-cloud-speech/google/cloud/speech/client.py
@@ -17,6 +17,7 @@
 from base64 import b64encode
 
 from google.cloud._helpers import _to_bytes
+from google.cloud._helpers import _bytes_to_unicode
 from google.cloud import client as client_module
 from google.cloud.speech.connection import Connection
 from google.cloud.speech.encoding import Encoding
@@ -237,7 +238,8 @@ def _build_request_data(sample, language_code=None, max_alternatives=None,
     :returns: Dictionary with required data for Google Speech API.
     """
     if sample.content is not None:
-        audio = {'content': b64encode(_to_bytes(sample.content))}
+        audio = {'content':
+                 _bytes_to_unicode(b64encode(_to_bytes(sample.content)))}
     else:
         audio = {'uri': sample.source_uri}
 
diff --git a/google-cloud-speech/unit_tests/test_client.py b/google-cloud-speech/unit_tests/test_client.py
@@ -61,13 +61,15 @@ def test_create_sample_from_client(self):
         self.assertEqual(content_sample.encoding, Encoding.FLAC)
 
     def test_sync_recognize_content_with_optional_parameters(self):
-        import base64
+        from base64 import b64encode
         from google.cloud._helpers import _to_bytes
+        from google.cloud._helpers import _bytes_to_unicode
+
         from google.cloud.speech.encoding import Encoding
         from google.cloud.speech.sample import Sample
         from unit_tests._fixtures import SYNC_RECOGNIZE_RESPONSE
-
-        _B64_AUDIO_CONTENT = base64.b64encode(_to_bytes(self.AUDIO_CONTENT))
+        _AUDIO_CONTENT = _to_bytes(self.AUDIO_CONTENT)
+        _B64_AUDIO_CONTENT = _bytes_to_unicode(b64encode(_AUDIO_CONTENT))
         RETURNED = SYNC_RECOGNIZE_RESPONSE
         REQUEST = {
             'config': {
