Don't override default ACL already configured on AWS side (tweak prev…

…ious).
jschneier · Jul 18, 2018 · 9b62b73 · 9b62b73
1 parent 752c095
commit 9b62b73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storages/backends/s3boto3.py b/storages/backends/s3boto3.py
@@ -115,7 +115,8 @@ def write(self, content):
         self._is_dirty = True
         if self._multipart is None:
             parameters = self._storage.object_parameters.copy()
-            parameters['ACL'] = self._storage.default_acl
+            if self._storage.default_acl:
+                parameters['ACL'] = self._storage.default_acl
             parameters['ContentType'] = (mimetypes.guess_type(self.obj.key)[0] or
                                          self._storage.default_content_type)
             if self._storage.reduced_redundancy:

diff --git a/tests/test_s3boto3.py b/tests/test_s3boto3.py
@@ -123,7 +123,6 @@ def test_content_type(self):
             content.file,
             ExtraArgs={
                 'ContentType': 'image/jpeg',
-                'ACL': self.storage.default_acl,
             }
         )