Fixing binary data deserialization (pynamodb#459)

betamoo · harleyk · commit 1399f912957b · 2018-03-13T14:36:06.000-07:00
* fix Binary Data deserialization
diff --git a/pynamodb/connection/base.py b/pynamodb/connection/base.py
@@ -33,7 +33,7 @@
     PUT_ITEM, SELECT, ACTION, EXISTS, VALUE, LIMIT, QUERY, SCAN, ITEM, LOCAL_SECONDARY_INDEXES,
     KEYS, KEY, EQ, SEGMENT, TOTAL_SEGMENTS, CREATE_TABLE, PROVISIONED_THROUGHPUT, READ_CAPACITY_UNITS,
     WRITE_CAPACITY_UNITS, GLOBAL_SECONDARY_INDEXES, PROJECTION, EXCLUSIVE_START_TABLE_NAME, TOTAL,
-    DELETE_TABLE, UPDATE_TABLE, LIST_TABLES, GLOBAL_SECONDARY_INDEX_UPDATES,
+    DELETE_TABLE, UPDATE_TABLE, LIST_TABLES, GLOBAL_SECONDARY_INDEX_UPDATES, ATTRIBUTES,
     CONSUMED_CAPACITY, CAPACITY_UNITS, QUERY_FILTER, QUERY_FILTER_VALUES, CONDITIONAL_OPERATOR,
     CONDITIONAL_OPERATORS, NULL, NOT_NULL, SHORT_ATTR_TYPES, DELETE, PUT,
     ITEMS, DEFAULT_ENCODING, BINARY_SHORT, BINARY_SET_SHORT, LAST_EVALUATED_KEY, RESPONSES, UNPROCESSED_KEYS,
@@ -447,6 +447,9 @@ def _handle_binary_attributes(data):
                         for item in six.itervalues(item_mapping):
                             for attr in six.itervalues(item):
                                 _convert_binary(attr)
+        if ATTRIBUTES in data:
+            for attr in six.itervalues(data[ATTRIBUTES]):
+                _convert_binary(attr)
         return data
 
     @property
diff --git a/pynamodb/tests/integration/binary_update_test.py b/pynamodb/tests/integration/binary_update_test.py
@@ -0,0 +1,25 @@
+import pytest
+
+from pynamodb.attributes import UnicodeAttribute, BinaryAttribute
+from pynamodb.models import Model
+
+
+@pytest.mark.ddblocal
+def test_update(ddb_url):
+    class DataModel(Model):
+        class Meta:
+            table_name = 'binary_attr_update'
+            host = ddb_url
+        pkey = UnicodeAttribute(hash_key=True)
+        data = BinaryAttribute()
+
+    DataModel.create_table(read_capacity_units=1, write_capacity_units=1)
+    data = b'\x00hey\xfb'
+    pkey = 'pkey'
+    DataModel(pkey, data=data).save()
+    m = DataModel.get(pkey)
+    assert m.data == data
+
+    new_data = b'\xff'
+    m.update(actions=[DataModel.data.set(new_data)])
+    assert new_data == m.data
diff --git a/pynamodb/tests/integration/conftest.py b/pynamodb/tests/integration/conftest.py
@@ -0,0 +1,19 @@
+import os
+
+import pytest
+
+
+@pytest.fixture
+def ddb_url():
+    """Obtain the URL of a local DynamoDB instance.
+
+    This is meant to be used with something like DynamoDB Local:
+
+      http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBLocal.html
+
+    It must be set up "out of band"; we merely assume it exists on
+    http://localhost:8000 or a URL specified though the
+    PYNAMODB_INTEGRATION_TEST_DDB_URL environment variable.
+    """
+    ddb_url = os.getenv("PYNAMODB_INTEGRATION_TEST_DDB_URL")
+    return "http://localhost:8000" if ddb_url is None else ddb_url
diff --git a/pynamodb/tests/integration/test_migration.py b/pynamodb/tests/integration/test_migration.py
@@ -1,4 +1,3 @@
-import os
 import pytest
 
 from pynamodb.attributes import BooleanAttribute, LegacyBooleanAttribute, UnicodeAttribute
@@ -7,22 +6,6 @@
 from pynamodb.models import Model
 
 
-@pytest.fixture()
-def ddb_url():
-    """Obtain the URL of a local DynamoDB instance.
-
-    This is meant to be used with something like DynamoDB Local:
-
-      http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBLocal.html
-
-    It must be set up "out of band"; we merely assume it exists on
-    http://localhost:8000 or a URL specified though the
-    PYNAMODB_INTEGRATION_TEST_DDB_URL environment variable.
-    """
-    ddb_url = os.getenv("PYNAMODB_INTEGRATION_TEST_DDB_URL")
-    return "http://localhost:8000" if ddb_url is None else ddb_url
-
-
 @pytest.mark.ddblocal
 def test_migrate_boolean_attributes_upgrade_path(ddb_url):
     class BAModel(Model):
