Merge pull request #775 from HiddenData/ticket-18899

Fixed #18899 -- FileSystemStorage.save should support any file-like objects

1 files changed, 6 insertions, 2 deletions

diff --git a/django/core/files/storage.py b/django/core/files/storage.py
index 0b623fe7c2..89caf3675d 100644
--- a/django/core/files/storage.py
+++ b/django/core/files/storage.py
@@ -37,13 +37,17 @@ class Storage(object):
 
     def save(self, name, content):
         """
-        Saves new content to the file specified by name. The content should be a
-        proper File object, ready to be read from the beginning.
+        Saves new content to the file specified by name. The content should be
+        a proper File object or any python file-like object, ready to be read
+        from the beginning.
         """
         # Get the proper name for the file, as it will actually be saved.
         if name is None:
             name = content.name
 
+        if not hasattr(content, 'chunks'):
+            content = File(content)
+
         name = self.get_available_name(name)
         name = self._save(name, content)