Alternative fix for #141

etianen · Aug 21, 2022 · 1814f59 · 1814f59
1 parent 3804325
commit 1814f59
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/django_s3_storage/storage.py b/django_s3_storage/storage.py
@@ -330,8 +330,16 @@ def _save(self, name, content):
                 else:
                     content.seek(0)
         # Save the file.
-        self.s3_connection.upload_fileobj(content, put_params.pop('Bucket'), put_params.pop('Key'),
+        # HACK: Patch the file object to prevent `upload_fileobj` from closing it.
+        # https://github.com/boto/boto3/issues/929
+        original_close = content.close
+        content.close = lambda: None
+        try:
+            self.s3_connection.upload_fileobj(content, put_params.pop('Bucket'), put_params.pop('Key'),
                                           ExtraArgs=put_params, Config=self._transfer_config)
+        finally:
+            # Restore the original close method.
+            content.close = original_close
         # Close all temp files.
         for temp_file in temp_files:
             temp_file.close()
@@ -525,14 +533,6 @@ class ManifestStaticS3Storage(ManifestFilesMixin, StaticS3Storage):
         "AWS_S3_MAX_AGE_SECONDS_CACHED": 60 * 60 * 24 * 365,  # 1 year.
     })
 
-    def _save(self, name, content):
-        # See: https://github.com/etianen/django-s3-storage/issues/141
-        # Fix adapted from: https://github.com/jschneier/django-storages/pull/968
-        content.seek(0)
-        with self.new_temporary_file() as tmp:
-            shutil.copyfileobj(content, tmp)
-            return super()._save(name, File(tmp))
-
     def post_process(self, *args, **kwargs):
         initial_aws_s3_max_age_seconds = self.settings.AWS_S3_MAX_AGE_SECONDS
         self.settings.AWS_S3_MAX_AGE_SECONDS = self.settings.AWS_S3_MAX_AGE_SECONDS_CACHED