Merge pull request #2818 from tseaver/2815-bigquery-py3k-bytes-field

Fix 'BYTES' field handling on Py3k.

Author: tseaver

bigquery/google/cloud/bigquery/_helpers.py

@@ -18,12 +18,15 @@
 from collections import OrderedDict
 import datetime
 
+import six
+
 from google.cloud._helpers import _date_from_iso8601_date
 from google.cloud._helpers import _datetime_from_microseconds
 from google.cloud._helpers import _datetime_to_rfc3339
 from google.cloud._helpers import _microseconds_from_datetime
 from google.cloud._helpers import _RFC3339_NO_FRACTION
 from google.cloud._helpers import _time_from_iso8601_time_naive
+from google.cloud._helpers import _to_bytes
 
 
 def _not_null(value, field):
@@ -57,7 +60,8 @@ def _string_from_json(value, _):
 def _bytes_from_json(value, field):
     """Base64-decode value"""
     if _not_null(value, field):
-        return base64.decodestring(value)
+        return base64.decodestring(
+            _to_bytes(value) if isinstance(value, six.text_type) else value)
 
 
 def _timestamp_from_json(value, field):

bigquery/unit_tests/test__helpers.py

@@ -135,13 +135,20 @@ def test_w_none_required(self):
         with self.assertRaises(TypeError):
             self._call_fut(None, _Field('REQUIRED'))
 
-    def test_w_base64_encoded_value(self):
+    def test_w_base64_encoded_bytes(self):
         import base64
         expected = b'Wonderful!'
         encoded = base64.encodestring(expected)
         coerced = self._call_fut(encoded, object())
         self.assertEqual(coerced, expected)
 
+    def test_w_base64_encoded_text(self):
+        import base64
+        expected = b'Wonderful!'
+        encoded = base64.encodestring(expected).decode('ascii')
+        coerced = self._call_fut(encoded, object())
+        self.assertEqual(coerced, expected)
+
 
 class Test_timestamp_from_json(unittest.TestCase):