Fix wrong removal from folder slashes if AWS_LOCATION is empty

Author: codingjoe

s3file/middleware.py

@@ -29,7 +29,8 @@ def __call__(self, request):
     def get_files_from_storage(paths):
         """Return S3 file where the name does not include the path."""
         for path in paths:
-            path = path.replace(os.path.dirname(storage.location) + '/', '', 1)
+            if storage.location:
+                path = path.replace(os.path.dirname(storage.location) + '/', '', 1)
             try:
                 f = storage.open(path)
                 f.name = os.path.basename(path)

tests/test_middleware.py

@@ -9,7 +9,7 @@ class TestS3FileMiddleware:
 
     def test_get_files_from_storage(self):
         content = b'test_get_files_from_storage'
-        name = storage.save('test_get_files_from_storage', ContentFile(content))
+        name = storage.save('tmp/s3file/test_get_files_from_storage', ContentFile(content))
         files = S3FileMiddleware.get_files_from_storage([name])
         file = next(files)
         assert file.read() == content
@@ -21,9 +21,25 @@ def test_process_request(self, rf):
         assert request.FILES.getlist('file')
         assert request.FILES.get('file').read() == b'uploaded'
 
-        storage.save('s3_file.txt', ContentFile(b's3file'))
+        storage.save('tmp/s3file/s3_file.txt', ContentFile(b's3file'))
         request = rf.post('/', data={
-            'file': '["custom/location/s3_file.txt"]', 's3file': '["file"]'
+            'file': '["custom/location/tmp/s3file/s3_file.txt"]', 's3file': '["file"]'
+        })
+        S3FileMiddleware(lambda x: None)(request)
+        assert request.FILES.getlist('file')
+        assert request.FILES.get('file').read() == b's3file'
+
+    def test_process_request__no_location(self, rf, settings):
+        settings.AWS_LOCATION = ''
+        uploaded_file = SimpleUploadedFile('uploaded_file.txt', b'uploaded')
+        request = rf.post('/', data={'file': uploaded_file})
+        S3FileMiddleware(lambda x: None)(request)
+        assert request.FILES.getlist('file')
+        assert request.FILES.get('file').read() == b'uploaded'
+
+        storage.save('tmp/s3file/s3_file.txt', ContentFile(b's3file'))
+        request = rf.post('/', data={
+            'file': '["tmp/s3file/s3_file.txt"]', 's3file': '["file"]'
         })
         S3FileMiddleware(lambda x: None)(request)
         assert request.FILES.getlist('file')