Address issues from PR feedback

Author: drakon

README.rst

@@ -200,13 +200,14 @@ Using optimized S3Boto3Storage
 ------------------------------
 
 Since ``S3Boto3Storage`` supports storing data from any other fileobj, 
-it uses a very general ``_save`` function. This leads to the 
-frontend uploading the file to S3 to then move it byte-by-byte. 
-For large files this leads to additional loading times for the user.
+it uses a generalized ``_save`` function. This leads to the frontend uploading 
+the file to S3 and then copying it byte-by-byte to perform a move operation just 
+to rename the uploaded object. For large files this leads to additional loading 
+times for the user. 
 
 That's why S3File provides an optimized version of this method at 
 ``storages_optimized.S3OptimizedUploadStorage``. It uses the more efficient 
-``copy`` given that we know that we only copy from one S3 location to another.
+``copy`` method from S3, given that we know that we only copy from one S3 location to another.
 
 .. code:: python
 

s3file/storages.py

@@ -8,8 +8,6 @@
 from django.core.files.storage import FileSystemStorage, default_storage
 from django.utils._os import safe_join
 
-from s3file.storages_optimized import S3OptimizedUploadStorage
-
 
 class S3MockStorage(FileSystemStorage):
     @property
@@ -54,27 +52,6 @@ class bucket:
         name = "test-bucket"
 
 
-class S3OptimizedMockStorage(S3OptimizedUploadStorage):
-    created_objects = {}
-
-    def _compress_content(self, content):
-        return content
-
-    class bucket:
-        name = "test-bucket"
-
-        class Object:
-            def __init__(self, key):
-                self.key = key
-                self.copy_from_bucket = None
-                self.copy_from_key = None
-                S3OptimizedMockStorage.created_objects[self.key] = self
-
-            def copy(self, s3_object, ExtraArgs):
-                self.copy_from_bucket = s3_object["Bucket"]
-                self.copy_from_key = s3_object["Key"]
-
-
 local_dev = isinstance(default_storage, FileSystemStorage)
 
 storage = default_storage if not local_dev else S3MockStorage()

s3file/storages_optimized.py

@@ -33,7 +33,7 @@ def _save(self, name, content):
         # obj.upload_fileobj(content, ExtraArgs=params)  # Disable upload function
 
         if not hasattr(content, "obj") or not hasattr(content.obj, "key"):
-            raise RuntimeError(
+            raise TypeError(
                 "The content object must be a S3 object and contain a valid key."
             )
 

tests/test_storages.py

@@ -1,14 +1,35 @@
 import pytest
 from django.core.files.base import ContentFile
 
-from s3file import storages
+from s3file.storages_optimized import S3OptimizedUploadStorage
+
+
+class S3OptimizedMockStorage(S3OptimizedUploadStorage):
+    created_objects = {}
+
+    def _compress_content(self, content):
+        return content
+
+    class bucket:
+        name = "test-bucket"
+
+        class Object:
+            def __init__(self, key):
+                self.key = key
+                self.copy_from_bucket = None
+                self.copy_from_key = None
+                S3OptimizedMockStorage.created_objects[self.key] = self
+
+            def copy(self, s3_object, ExtraArgs):
+                self.copy_from_bucket = s3_object["Bucket"]
+                self.copy_from_key = s3_object["Key"]
 
 
 class TestStorages:
     url = "/__s3_mock__/"
 
     def test_post__save_optimized(self):
-        storage = storages.S3OptimizedMockStorage()
+        storage = S3OptimizedMockStorage()
         obj = storage.bucket.Object("tmp/s3file/s3_file.txt")
 
         class Content:
@@ -26,7 +47,7 @@ def __init__(self, obj):
         assert stored_object.copy_from_key == "tmp/s3file/s3_file.txt"
 
     def test_post__save_optimized_gzip(self):
-        storage = storages.S3OptimizedMockStorage()
+        storage = S3OptimizedMockStorage()
         obj = storage.bucket.Object("tmp/s3file/s3_file.css")
         storage.gzip = True
 
@@ -45,9 +66,9 @@ def __init__(self, obj):
         assert stored_object.copy_from_key == "tmp/s3file/s3_file.css"
 
     def test_post__save_optimized_fail(self):
-        storage = storages.S3OptimizedMockStorage()
+        storage = S3OptimizedMockStorage()
 
-        with pytest.raises(RuntimeError) as excinfo:
+        with pytest.raises(TypeError) as excinfo:
             storage._save("tmp/s3file/s3_file_copied.txt", ContentFile(b"s3file"))
 
         assert "The content object must be a S3 object and contain a valid key." in str(