Ticket #11739: 11739-4.diff

django/core/files/base.py

@@ -1 +1 @@
 import os
 try:
-    from cStringIO import StringIO
+    from cStringIO import StringIO as fastStringIO
 except ImportError:
-    from StringIO import StringIO
+    from StringIO import StringIO as fastStringIO
+from StringIO import StringIO
 
 from django.utils.encoding import smart_str, smart_unicode
 from django.core.files.utils import FileProxyMixin
@@ -84 +85 @@
         # Iterate over this file-like object by newlines
         buffer_ = None
         for chunk in self.chunks():
-            chunk_buffer = StringIO(chunk)
+            chunk_buffer = fastStringIO(chunk)
 
             for line in chunk_buffer:
                 if buffer_:
@@ -124 +125 @@
     """
     def __init__(self, content, name=None):
         content = content or ''
-        super(ContentFile, self).__init__(StringIO(content), name=name)
+        if isinstance(content, unicode):
+            # fastStringIO might be linked to cStringIO, which doesn't support
+            # unicode content (#11739)
+            file_wrapper = StringIO(content)
+        else:
+            file_wrapper = fastStringIO(content)
+        super(ContentFile, self).__init__(file_wrapper, name=name)
         self.size = len(content)
 
     def __str__(self):

tests/regressiontests/file_storage/tests.py

@@ -553 +553 @@
     def test_content_file_custome_name(self):
         name = "I can have a name too!"
         self.assertEqual(ContentFile("content", name=name).name, name)
+
+class ContentFileUnicodeBug(unittest.TestCase):
+    """
+    Tests that ContentFile instances can contain unicode (#11739)
+    """
+    def test_unicode(self):
+        """
+        ContentFile instances should be able to handle unicode.
+        """
+        snowman = u'☃'
+        file = ContentFile(snowman)
+        self.assertEqual(file.read(), snowman)