Merge tag '0.3.2'

stevearc · Feb 23, 2015 · 9d7745e · 9d7745e
2 parents c974e42 + 341f235
commit 9d7745e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.1
+current_version = 0.3.2
 tag_name = {new_version}
 files = setup.py dynamo3/__init__.py
 commit = True

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,5 +1,9 @@
 Changelog
 =========
+0.3.2
+-----
+* Bug fix: Serialization of blobs broken with botocore 0.85.0
+
 0.3.1
 -----
 * Bug fix: Crash when parsing description of table being deleted

diff --git a/README.rst b/README.rst
@@ -1,7 +1,6 @@
 Dynamo3
 =======
 :Build: |build|_ |coverage|_
-:0.2 Build: |build-0.2|_ |coverage-0.2|_
 :Downloads: http://pypi.python.org/pypi/dynamo3
 :Source: https://github.com/stevearc/dynamo3
 
@@ -10,11 +9,6 @@ Dynamo3
 .. |coverage| image:: https://coveralls.io/repos/stevearc/dynamo3/badge.png?branch=master
 .. _coverage: https://coveralls.io/r/stevearc/dynamo3?branch=master
 
-.. |build-0.2| image:: https://travis-ci.org/stevearc/dynamo3.png?branch=0.2
-.. _build-0.2: https://travis-ci.org/stevearc/dynamo3
-.. |coverage-0.2| image:: https://coveralls.io/repos/stevearc/dynamo3/badge.png?branch=0.2
-.. _coverage-0.2: https://coveralls.io/r/stevearc/dynamo3?branch=0.2
-
 This is a stop-gap measure while `boto3 <http://github.com/boto/boto3>`_ is
 under development. I have kept the API mostly similar to boto (with a few
 improvements). This should only be used if you need to connect to DynamoDB

diff --git a/dynamo3/__init__.py b/dynamo3/__init__.py
@@ -11,4 +11,4 @@
 from .types import Dynamizer, Binary, TYPES, TYPES_REV
 from .util import is_null
 
-__version__ = '0.3.1'
+__version__ = '0.3.2'
diff --git a/dynamo3/types.py b/dynamo3/types.py
@@ -61,10 +61,6 @@ def __ne__(self, other):
     def __repr__(self):
         return 'Binary(%s)' % self.value
 
-    def encode(self):
-        """ Encode the binary string for Dynamo """
-        return base64.b64encode(self.value).decode()
-
 
 def encode_set(dynamizer, value):
     """ Encode a set for the DynamoDB format """
@@ -110,7 +106,7 @@ def __init__(self):
         self.register_encoder(Decimal, lambda _, v: (NUMBER, six.text_type(DECIMAL_CONTEXT.create_decimal(v))))
         self.register_encoder(set, encode_set)
         self.register_encoder(frozenset, encode_set)
-        self.register_encoder(Binary, lambda _, v: (BINARY, v.encode()))
+        self.register_encoder(Binary, lambda _, v: (BINARY, v.value))
         self.register_encoder(bool, lambda _, v: (BOOL, v))
         self.register_encoder(list, encode_list)
         self.register_encoder(dict, encode_dict)

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
     CHANGES = f.read()
 
 REQUIREMENTS = [
-    'botocore>=0.65.0',
+    'botocore>=0.85.0',
     'six',
 ]
 
@@ -29,7 +29,7 @@
 if __name__ == "__main__":
     setup(
         name='dynamo3',
-        version='0.3.1',
+        version='0.3.2',
         description='Python 3 compatible library for DynamoDB',
         long_description=README + '\n\n' + CHANGES,
         classifiers=[