David Larlet avatar David Larlet committed f459336 Merge

Merged in tobias.mcnulty/django-storages (pull request #17)

Comments (0)

Files changed (1)

storages/backends/s3boto.py

 QUERYSTRING_EXPIRE = getattr(settings, 'AWS_QUERYSTRING_EXPIRE', 3600)
 REDUCED_REDUNDANCY = getattr(settings, 'AWS_REDUCED_REDUNDANCY', False)
 LOCATION = getattr(settings, 'AWS_LOCATION', '')
+ENCRYPTION = getattr(settings, 'AWS_S3_ENCRYPTION', False)
 CUSTOM_DOMAIN = getattr(settings, 'AWS_S3_CUSTOM_DOMAIN', None)
 CALLING_FORMAT = getattr(settings, 'AWS_S3_CALLING_FORMAT',
                          SubdomainCallingFormat())
             querystring_auth=QUERYSTRING_AUTH,
             querystring_expire=QUERYSTRING_EXPIRE,
             reduced_redundancy=REDUCED_REDUNDANCY,
+            encryption=ENCRYPTION,
             custom_domain=CUSTOM_DOMAIN,
             secure_urls=SECURE_URLS,
             location=LOCATION,
         self.querystring_auth = querystring_auth
         self.querystring_expire = querystring_expire
         self.reduced_redundancy = reduced_redundancy
+        self.encryption = encryption
         self.custom_domain = custom_domain
         self.secure_urls = secure_urls
         self.location = location or ''
         if self.preload_metadata:
             self._entries[encoded_name] = key
 
-
         key.set_metadata('Content-Type', content_type)
+        # only pass backwards incompatible arguments if they vary from the default
+        kwargs = {}
+        if self.encryption:
+            kwargs['encrypt_key'] = self.encryption
         key.set_contents_from_file(content, headers=headers, policy=self.acl,
                                  reduced_redundancy=self.reduced_redundancy,
-                                 rewind=True)
+                                 rewind=True, **kwargs)
         return cleaned_name
 
     def delete(self, name):
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.