Fix deserialization bug in BinarySetAttribute + better error msg when parsing json (pynamodb#480)

betamoo · harleyk · commit 9bfc8e03134c · 2018-03-28T15:22:38.000-07:00
diff --git a/pynamodb/attributes.py b/pynamodb/attributes.py
@@ -328,8 +328,11 @@ def deserialize(self, value):
         """
         Returns a decoded string from base64
         """
-        if value and len(value):
-            return set([b64decode(val.encode(DEFAULT_ENCODING)) for val in value])
+        try:
+            if value and len(value):
+                return set([b64decode(val.decode(DEFAULT_ENCODING)) for val in value])
+        except AttributeError:
+            return set([b64decode(val) for val in value])
 
 
 class UnicodeSetAttribute(SetMixin, Attribute):
diff --git a/pynamodb/connection/base.py b/pynamodb/connection/base.py
@@ -349,6 +349,7 @@ def _make_api_call(self, operation_name, operation_kwargs):
             attempt_number = i + 1
             is_last_attempt_for_exceptions = i == self._max_retry_attempts_exception
 
+            response = None
             try:
                 response = self.requests_session.send(
                     prepared_request,
@@ -359,6 +360,8 @@ def _make_api_call(self, operation_name, operation_kwargs):
             except (requests.RequestException, ValueError) as e:
                 if is_last_attempt_for_exceptions:
                     log.debug('Reached the maximum number of retry attempts: %s', attempt_number)
+                    if response:
+                        e.args += (str(response.content),)
                     raise
                 else:
                     # No backoff for fast-fail exceptions that likely failed at the frontend
diff --git a/pynamodb/tests/integration/binary_update_test.py b/pynamodb/tests/integration/binary_update_test.py
@@ -1,11 +1,11 @@
 import pytest
 
-from pynamodb.attributes import UnicodeAttribute, BinaryAttribute
+from pynamodb.attributes import UnicodeAttribute, BinaryAttribute, BinarySetAttribute
 from pynamodb.models import Model
 
 
 @pytest.mark.ddblocal
-def test_update(ddb_url):
+def test_binary_attribute_update(ddb_url):
     class DataModel(Model):
         class Meta:
             table_name = 'binary_attr_update'
@@ -23,3 +23,23 @@ class Meta:
     new_data = b'\xff'
     m.update(actions=[DataModel.data.set(new_data)])
     assert new_data == m.data
+
+@pytest.mark.ddblocal
+def test_binary_set_attribute_update(ddb_url):
+    class DataModel(Model):
+        class Meta:
+            table_name = 'binary_set_attr_update'
+            host = ddb_url
+        pkey = UnicodeAttribute(hash_key=True)
+        data = BinarySetAttribute()
+
+    DataModel.create_table(read_capacity_units=1, write_capacity_units=1)
+    data = set([b'\x00hey\xfb', b'\x00beautiful\xfb'])
+    pkey = 'pkey'
+    DataModel(pkey, data=data).save()
+    m = DataModel.get(pkey)
+    assert m.data == data
+
+    new_data = set([b'\xff'])
+    m.update(actions=[DataModel.data.set(new_data)])
+    assert new_data == m.data
