merge

simplegeo · Jun 10, 2011 · 4a033ca · 4a033ca
1 parent 7f2625e
commit 4a033ca
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/uploadify_s3/uploadify_s3.py b/uploadify_s3/uploadify_s3.py
@@ -17,14 +17,14 @@
 EXCLUDED_KEYS     = ('AWSAccessKeyId', 'policy', 'signature')
 
 # AWS Options
-ACCESS_KEY_ID       = getattr(settings, 'AWS_ACCESS_KEY_ID', None)
-SECRET_ACCESS_KEY   = getattr(settings, 'AWS_SECRET_ACCESS_KEY', None)
-BUCKET_NAME         = getattr(settings, 'AWS_BUCKET_NAME', None)
-SECURE_URLS         = getattr(settings, 'AWS_S3_SECURE_URLS', True)
-BUCKET_URL          = getattr(settings, 'AWS_BUCKET_URL', 'http://' if SECURE_URLS else 'https://' + BUCKET_NAME + '.s3.amazonaws.com')
-DEFAULT_ACL         = getattr(settings, 'AWS_DEFAULT_ACL', 'private')
-DEFAULT_KEY_PATTERN = getattr(settings, 'AWS_DEFAULT_KEY_PATTERN', '${filename}')
-DEFAULT_FORM_TIME   = getattr(settings, 'AWS_DEFAULT_FORM_LIFETIME', 36000) # 10 HOURS
+ACCESS_KEY_ID       = getattr(settings, 'UPLOADIFY_AWS_ACCESS_KEY_ID', None)
+SECRET_ACCESS_KEY   = getattr(settings, 'UPLOADIFY_AWS_SECRET_ACCESS_KEY', None)
+BUCKET_NAME         = getattr(settings, 'UPLOADIFY_AWS_BUCKET_NAME', None)
+SECURE_URLS         = getattr(settings, 'UPLOADIFY_AWS_S3_SECURE_URLS', True)
+BUCKET_URL          = getattr(settings, 'UPLOADIFY_AWS_BUCKET_URL', 'http://' if SECURE_URLS else 'https://' + BUCKET_NAME + '.s3.amazonaws.com')
+DEFAULT_ACL         = getattr(settings, 'UPLOADIFY_AWS_DEFAULT_ACL', 'private')
+DEFAULT_KEY_PATTERN = getattr(settings, 'UPLOADIFY_AWS_DEFAULT_KEY_PATTERN', '${filename}')
+DEFAULT_FORM_TIME   = getattr(settings, 'UPLOADIFY_AWS_DEFAULT_FORM_LIFETIME', 36000) # 10 HOURS
 
 # Defaults for required Uploadify options
 DEFAULT_CANCELIMG = settings.MEDIA_URL + "uploadify/cancel.png"