Russell Moffitt avatar Russell Moffitt committed b903f76

cleaning up _get_access_keys override

Comments (0)

Files changed (1)

storages/backends/s3botomulti.py

             def _get_access_keys(self):
                 access_key = ACCESS_KEY_NAME
                 secret_key = SECRET_KEY_NAME
-                if (access_key or secret_key) and (not access_key or not secret_key):
-                   access_key = os.environ.get(ACCESS_KEY_NAME)
-                   secret_key = os.environ.get(SECRET_KEY_NAME)
-
                 if access_key and secret_key:
                     # Both were provided, so use them
                     return access_key, secret_key
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.