Merge remote-tracking branch 'origin/pullredirect'

This commit is contained in:
root 2013-12-04 00:44:19 +00:00
commit 49564fe7ef

View file

@ -36,7 +36,7 @@ class S3Storage(Storage):
def __init__(self, storage_path, s3_access_key, s3_secret_key, s3_bucket):
self._initialized = False
self._bucket = s3_bucket
self._bucket_name = s3_bucket
self._access_key = s3_access_key
self._secret_key = s3_secret_key
self._root_path = storage_path
@ -47,7 +47,7 @@ class S3Storage(Storage):
if not self._initialized:
self._s3_conn = boto.s3.connection.S3Connection(self._access_key,
self._secret_key)
self._s3_bucket = self._s3_conn.get_bucket(self._s3_bucket)
self._s3_bucket = self._s3_conn.get_bucket(self._bucket_name)
self._initialized = True
def _debug_key(self, key):