Skip to content

Commit

Permalink
Merge pull request #20 from 4Catalyzer/default-s3-keys
Browse files Browse the repository at this point in the history
Allow optional s3 keys
  • Loading branch information
taion authored Sep 8, 2016
2 parents 9ec323d + 16a9a86 commit 17dfa93
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion flask_annex/s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

class S3Annex(AnnexBase):
def __init__(
self, access_key_id, secret_access_key, bucket_name,
self, bucket_name, access_key_id=None, secret_access_key=None,
url_expires_in=DEFAULT_URL_EXPIRES_IN):
self._connection = S3Connection(access_key_id, secret_access_key)
self._bucket = self._connection.get_bucket(
Expand Down

0 comments on commit 17dfa93

Please sign in to comment.