Skip to content

Updating AWS credential setting names to be inline with other apps #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Updating AWS credential setting names to be inline with other apps #5

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d9575d
Merge branch 'python3'
Jun 11, 2015
e2f09f4
Merge branch 'django-1.8-drop'
Jun 11, 2015
f6aa511
Merge branch 'django-1.8-drop'
Jun 11, 2015
fd3eb51
Merge branch 'django-1.8-drop'
Jun 11, 2015
11cf60b
Merge branch 'master' of github.com:priestc/django-easydump
Jun 11, 2015
887e5d7
Updating AWS credential setting names to be inline with other apps
Jun 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion easydump/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ def __init__(self, md):
self.drop_cmd = dumper.get_drop_cmd(self)

def _get_bucket(self):
conn = S3Connection(settings.AWS_ACCESS_KEY, settings.AWS_SECRET_KEY)
conn = S3Connection(
getattr(settings, 'AWS_ACCESS_KEY_ID', None) or getattr(settings, 'AWS_ACCESS_KEY'),
getattr(settings, 'AWS_SECRET_ACCESS_KEY', None) or getattr(settings, 'AWS_SECRET_KEY'),
)
return conn.get_bucket(self.bucket_name)

def _get_database(self):
Expand Down