Ensure that base64-encoded bytes get decoded to text for JSON. (#3195)

Closes #3193.
googleapis · Mar 23, 2017 · 5425bc7 · 5425bc7
1 parent b035bf7
commit 5425bc7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/bigquery/google/cloud/bigquery/_helpers.py b/bigquery/google/cloud/bigquery/_helpers.py
@@ -144,7 +144,7 @@ def _bool_to_json(value):
 def _bytes_to_json(value):
     """Coerce 'value' to an JSON-compatible representation."""
     if isinstance(value, bytes):
-        value = base64.standard_b64encode(value)
+        value = base64.standard_b64encode(value).decode('ascii')
     return value
 
 

diff --git a/bigquery/unit_tests/test__helpers.py b/bigquery/unit_tests/test__helpers.py
@@ -555,11 +555,10 @@ def test_w_non_bytes(self):
         self.assertIs(self._call_fut(non_bytes), non_bytes)
 
     def test_w_bytes(self):
-        import base64
-
         source = b'source'
-        expected = base64.standard_b64encode(source)
-        self.assertEqual(self._call_fut(source), expected)
+        expected = u'c291cmNl'
+        converted = self._call_fut(source)
+        self.assertEqual(converted, expected)
 
 
 class Test_timestamp_to_json(unittest.TestCase):