Merge pull request #4998 from kobotoolbox/fix-corrupted-large-s3-files

Fix corrupted large ZIP files with AWS S3 storage
kobotoolbox · Jul 8, 2024 · c6ad0e6 · c6ad0e6
2 parents fc21ac2 + 89efc7e
commit c6ad0e6
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/kobo/apps/storage_backends/s3boto3.py b/kobo/apps/storage_backends/s3boto3.py
@@ -2,10 +2,12 @@
 
 import logging
 
-import storages.backends.s3boto3 as upstream
+import storages.backends.s3 as upstream
+from django.utils.deconstruct import deconstructible
 
 
-class S3Boto3StorageFile(upstream.S3Boto3StorageFile):
+@deconstructible
+class S3File(upstream.S3File):
     def __init__(self, name, mode, storage, buffer_size=None):
         super().__init__(name, mode, storage, buffer_size)
         self._remote_file_size = 0
@@ -31,9 +33,10 @@ def _flush_write_buffer(self):
             self.file.truncate()
 
 
-upstream.S3Boto3StorageFile = S3Boto3StorageFile
+upstream.S3File = S3File
 
 
-class S3Boto3Storage(upstream.S3Boto3Storage):
-    # Uses the overridden S3Boto3StorageFile
+@deconstructible
+class S3Boto3Storage(upstream.S3Storage):
+    # Uses the overridden S3File
     pass