Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/bitly/asyncdynamo
Browse files Browse the repository at this point in the history
Conflicts:
	asyncdynamo/asyncdynamo.py
  • Loading branch information
rhettg committed Sep 15, 2014
2 parents 21473b0 + bb922e6 commit eac363a
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 8 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Version 0.2.8 - 2013-02-28
* Fix compatibility issues wth boto>=2.7.0

Version 0.2.6 - 2013-01-10
* Allow user-defined IOLoop
* Change error construction to comply with boto 2.3.0
* Handle edge case where no json response is received

Version 0.2.5 - 2012-03-05
* Improve error handling from STS

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Asyncdynamo

Asynchronous Amazon DynamoDB library for Tornado

Requires boto and python 2.7
Requires boto>=2.3 and python 2.7

Tested with Boto 2.2.1 and Tornado 1.2.1
Tested with Tornado 1.2.1

Installation
------------
Expand Down
5 changes: 3 additions & 2 deletions asyncdynamo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
raise ImportError("tornado library not installed. Install tornado. https://github.com/facebook/tornado")
try:
import boto
assert tuple(map(int,boto.Version.split('.'))) >= (2,3,0), "Boto >= 2.3.0 required."
except ImportError:
raise ImportError("boto library not installed. Install boto. https://github.com/boto/boto")

version = "0.2.5"
version_info = (0, 2, 5)
version = "0.2.8"
version_info = (0, 2, 8)
5 changes: 3 additions & 2 deletions asyncdynamo/asyncdynamo.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ def cb_for_update(error=None):
headers=headers,
body=body,
validate_cert=self.validate_cert)
request.path = '/' # Important! set the path variable for signing by boto. '/' is the path for all dynamodb requests
request.path = '/' # Important! set the path variable for signing by boto (<2.7). '/' is the path for all dynamodb requests
request.auth_path = '/' # Important! set the auth_path variable for signing by boto(>2.7). '/' is the path for all dynamodb requests
if self.authenticate_requests:
self._auth_handler.add_auth(request) # add signature to headers of the request
self.http_client.fetch(request, functools.partial(self._finish_make_request,
Expand Down Expand Up @@ -226,7 +227,7 @@ def _finish_make_request(self, response, callback, orig_request, token_used, obj
return callback(None, error=DynamoDBResponseError(response.code, response.body))
else:
return callback(json_response, error=None)

def get_item(self, table_name, key, callback, attributes_to_get=None,
consistent_read=False, object_hook=None):
'''
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from distutils.core import setup

# also update version in __init__.py
version = '0.2.5'
version = '0.2.8'

setup(
name="asyncdynamo",
Expand All @@ -20,5 +20,5 @@
packages=['asyncdynamo'],
install_requires=['tornado', 'boto>=2.3.0'],
requires=['tornado'],
download_url="http://github.com/downloads/bitly/asyncdynamo/asyncdynamo-%s.tar.gz" % version,
download_url="https://s3.amazonaws.com/bitly-downloads/asyncdynamo/asyncdynamo-%s.tar.gz" % version,
)

0 comments on commit eac363a

Please sign in to comment.