From 418b97733f348800c9eb9c39c5d1cb2a493f15bd Mon Sep 17 00:00:00 2001
From: Josh Schneier <josh.schneier@gmail.com>
Date: Tue, 15 Dec 2020 15:52:43 -0500
Subject: [PATCH] [s3] Fix writing bytearrays

---
 storages/backends/s3boto3.py |  8 ++++----
 storages/utils.py            |  9 +++++++++
 tests/test_s3boto3.py        | 11 +++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/storages/backends/s3boto3.py b/storages/backends/s3boto3.py
index 6a8bf2452..ab64787c9 100644
--- a/storages/backends/s3boto3.py
+++ b/storages/backends/s3boto3.py
@@ -11,13 +11,13 @@
 from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
 from django.core.files.base import File
 from django.utils.deconstruct import deconstructible
-from django.utils.encoding import filepath_to_uri, force_bytes
+from django.utils.encoding import filepath_to_uri
 from django.utils.timezone import is_naive, make_naive
 
 from storages.base import BaseStorage
 from storages.utils import (
     NonCloseableBufferedReader, check_location, get_available_overwrite_name,
-    lookup_env, safe_join, setting,
+    lookup_env, safe_join, setting, to_bytes,
 )
 
 try:
@@ -158,7 +158,7 @@ def write(self, content):
             )
         if self.buffer_size <= self._buffer_file_size:
             self._flush_write_buffer()
-        bstr = force_bytes(content)
+        bstr = to_bytes(content)
         self._raw_bytes_written += len(bstr)
         return super().write(bstr)
 
@@ -412,7 +412,7 @@ def _compress_content(self, content):
         #  For S3 this defeats detection of changes using MD5 sums on gzipped files
         #  Fixing the mtime at 0.0 at compression time avoids this problem
         with GzipFile(mode='wb', fileobj=zbuf, mtime=0.0) as zfile:
-            zfile.write(force_bytes(content.read()))
+            zfile.write(to_bytes(content.read()))
         zbuf.seek(0)
         # Boto 2 returned the InMemoryUploadedFile with the file pointer replaced,
         # but Boto 3 seems to have issues with that. No need for fp.name in Boto3
diff --git a/storages/utils.py b/storages/utils.py
index cc3b40b99..bf961dd1b 100644
--- a/storages/utils.py
+++ b/storages/utils.py
@@ -6,6 +6,15 @@
 from django.core.exceptions import (
     ImproperlyConfigured, SuspiciousFileOperation,
 )
+from django.utils.encoding import force_bytes
+
+
+def to_bytes(content):
+    """Wrap Django's force_bytes to pass through bytearrays."""
+    if isinstance(content, bytearray):
+        return content
+
+    return force_bytes(content)
 
 
 def setting(name, default=None):
diff --git a/tests/test_s3boto3.py b/tests/test_s3boto3.py
index cbffa4e7b..627a250c0 100644
--- a/tests/test_s3boto3.py
+++ b/tests/test_s3boto3.py
@@ -296,6 +296,17 @@ def test_storage_open_write(self):
         multipart.complete.assert_called_once_with(
             MultipartUpload={'Parts': [{'ETag': '123', 'PartNumber': 1}]})
 
+    def test_write_bytearray(self):
+        """Test that bytearray write exactly (no extra "bytearray" from stringify)."""
+        name = "saved_file.bin"
+        content = bytearray(b"content")
+        file = self.storage.open(name, "wb")
+        obj = self.storage.bucket.Object.return_value
+        # Set the name of the mock object
+        obj.key = name
+        bytes_written = file.write(content)
+        self.assertEqual(len(content), bytes_written)
+
     def test_storage_open_no_write(self):
         """
         Test opening file in write mode and closing without writing.