Skip to content

D
django-pyfs
Commit e594ac26 by Piotr Mitros
Options

Merge branch 'master' of https://github.com/pmitros/django-pyfs

parents b96af7d1 28527de3
Showing with 2 additions and 2 deletions
djpyfs/djpyfs.py
...@@ -34,8 +34,8 @@ elif djfs_settings['type'] == 's3fs': ...@@ -34,8 +34,8 @@ elif djfs_settings['type'] == 's3fs':
from fs.s3fs import S3FS from fs.s3fs import S3FS
from boto.s3.connection import S3Connection from boto.s3.connection import S3Connection
from boto.s3.key import Key from boto.s3.key import Key
key_id = djfs_settings.get('AWS_ACCESS_KEY_ID', None) key_id = djfs_settings.get('aws_access_key_id', None)
key_secret = djfs_settings.get('AWS_SECRET_ACCESS_KEY', None) key_secret = djfs_settings.get('aws_secret_access_key', None)
s3conn = S3Connection(aws_access_key_id=key_id, aws_secret_access_key=key_secret) s3conn = S3Connection(aws_access_key_id=key_id, aws_secret_access_key=key_secret)
else: else:
raise AttributeError("Bad filesystem: "+str(djfs_settings['type'])) raise AttributeError("Bad filesystem: "+str(djfs_settings['type']))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment