1. s3cmd
  2. Commit 1af8d99c385c9228fa2439cc7cc97853a41b0934
Browse code

added support for default AWS CLI env naming convention

Vasileios Mitrousis authored on 2014/05/26 21:20:35
Showing 1 changed files
S3/Config.py
History View file @ 1af8d99
... ... 
@@ -134,8 +134,8 @@ class Config(object):
134 134 
                 self.secret_key = secret_key
135 135
136 136 
             if len(self.access_key)==0:
137 
-                env_access_key = os.environ.get("AWS_ACCESS_KEY_ID", None)
138 
-                env_secret_key = os.environ.get("AWS_SECRET_ACCESS_KEY", None)
137 
+                env_access_key = os.environ.get("AWS_ACCESS_KEY", None) or os.environ.get("AWS_ACCESS_KEY_ID", None)
138 
+                env_secret_key = os.environ.get("AWS_SECRET_KEY", None) or os.environ.get("AWS_SECRET_ACCESS_KEY", None)
139 139 
                 if env_access_key:
140 140 
                     self.access_key = env_access_key
141 141 
                     self.secret_key = env_secret_key