Add support for files > 5 gb with S3BotoStorage (#201)

* Add support for files > 5 gb with S3BotoStorage Fixes #194 * Fix tests
jschneier · Sep 13, 2016 · b334a99 · b334a99
1 parent 5f28057
commit b334a99
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/storages/backends/s3boto3.py b/storages/backends/s3boto3.py
@@ -462,7 +462,7 @@ def _save_content(self, obj, content, parameters):
         if self.default_acl:
             put_parameters['ACL'] = self.default_acl
         content.seek(0, os.SEEK_SET)
-        obj.put(Body=content, **put_parameters)
+        obj.upload_fileobj(content, ExtraArgs=put_parameters)
 
     def delete(self, name):
         name = self._normalize_name(self._clean_name(name))

diff --git a/tests/test_s3boto3.py b/tests/test_s3boto3.py
@@ -118,10 +118,12 @@ def test_storage_save(self):
         self.storage.bucket.Object.assert_called_once_with(name)
 
         obj = self.storage.bucket.Object.return_value
-        obj.put.assert_called_with(
-            Body=content,
-            ContentType='text/plain',
-            ACL=self.storage.default_acl,
+        obj.upload_fileobj.assert_called_with(
+            content,
+            ExtraArgs={
+                'ContentType': 'text/plain',
+                'ACL': self.storage.default_acl,
+            }
         )
 
     def test_storage_save_gzip(self):
@@ -133,14 +135,17 @@ def test_storage_save_gzip(self):
         content = ContentFile("I should be gzip'd")
         self.storage.save(name, content)
         obj = self.storage.bucket.Object.return_value
-        obj.put.assert_called_with(
-            Body=mock.ANY,
-            ContentType='text/css',
-            ContentEncoding='gzip',
-            ACL=self.storage.default_acl
+        obj.upload_fileobj.assert_called_with(
+            mock.ANY,
+            ExtraArgs={
+                'ContentType': 'text/css',
+                'ContentEncoding': 'gzip',
+                'ACL': self.storage.default_acl,
+            }
         )
-        body = obj.put.call_args[1]['Body']
-        zfile = gzip.GzipFile(mode='rb', fileobj=body)
+        args, kwargs = obj.upload_fileobj.call_args
+        content = args[0]
+        zfile = gzip.GzipFile(mode='rb', fileobj=content)
         self.assertEquals(zfile.read(), b"I should be gzip'd")
 
     def test_compress_content_len(self):