Ticket #8204: filestorage.2.diff

django/core/files/base.py

@@ -4 +4 @@
 
 try:
     from cStringIO import StringIO
+    c_string_io = True
 except ImportError:
     from StringIO import StringIO
+    c_string_io = False
 
 class File(object):
     DEFAULT_CHUNK_SIZE = 64 * 2**10
@@ -151 +153 @@
     """
     A File-like object that takes just raw content, rather than an actual file.
     """
-    def __init__(self, content):
-        self.file = StringIO(content or '')
+    def __init__(self, content = None):
+        if c_string_io:
+            if content:
+                self.file = StringIO(content)
+                self._mode = "r"
+            else:
+                self.file = StringIO()
+                self._mode = "w"
+        else:
+            self.file = StringIO(content or '')
+            self._mode = "w"
         self.size = len(content or '')
         self.file.seek(0)
+        self._name = "contentfile"
         self._closed = False
 
     def __str__(self):
@@ -163 +175 @@
     def __nonzero__(self):
         return True
 
+    def _get_size(self):
+        old_position = self.file.tell()
+        self.file.seek(0, 2)
+        size = self.file.tell()
+        self.file.seek(old_position)
+        return size
+
+    def _set_size(self, value): pass
+
+    size = property(_get_size, _set_size)
+
     def open(self, mode=None):
         if self._closed:
             self._closed = False