Ticket #19367: 19367-2b.diff

django/core/files/base.py

@@ -1 +1 @@
 from __future__ import unicode_literals
 
 import os
-from io import BytesIO, StringIO, UnsupportedOperation
+from io import BytesIO, UnsupportedOperation
 
 from django.utils.encoding import smart_text
 from django.core.files.utils import FileProxyMixin
 from django.utils import six
-from django.utils.encoding import python_2_unicode_compatible
+from django.utils.encoding import force_bytes, python_2_unicode_compatible
 
 @python_2_unicode_compatible
 class File(FileProxyMixin):
@@ -134 +134 @@
     A File-like object that takes just raw content, rather than an actual file.
     """
     def __init__(self, content, name=None):
-        content = content or b''
-        stream_class = StringIO if isinstance(content, six.text_type) else BytesIO
-        super(ContentFile, self).__init__(stream_class(content), name=name)
+        super(ContentFile, self).__init__(BytesIO(force_bytes(content)), name=name)
         self.size = len(content)
 
     def __str__(self):

tests/regressiontests/file_storage/tests.py

@@ -560 +560 @@
 
 class ContentFileTestCase(unittest.TestCase):
 
+    def setUp(self):
+        self.storage_dir = tempfile.mkdtemp()
+        self.storage = FileSystemStorage(self.storage_dir)
+
+    def tearDown(self):
+        shutil.rmtree(self.storage_dir)
+
     def test_content_file_default_name(self):
         self.assertEqual(ContentFile(b"content").name, None)
 
@@ -573 +580 @@
     def test_content_file_input_type(self):
         """
         Test that ContentFile can accept both bytes and unicode and that the
-        retrieved content is of the same type.
+        retrieved content is always bytes.
         """
         self.assertTrue(isinstance(ContentFile(b"content").read(), bytes))
-        self.assertTrue(isinstance(ContentFile("español").read(), six.text_type))
+        self.assertTrue(isinstance(ContentFile("español").read(), bytes))
+
+    def test_content_saving(self):
+        """
+        Test that ContentFile can be saved correctly with the filesystem storage,
+        both if it was initialized with string or unicode content"""
+        self.storage.save('bytes.txt', ContentFile(b"content"))
+        self.storage.save('unicode.txt', ContentFile("español"))
+
 
 class NoNameFileTestCase(unittest.TestCase):
     """