Ticket #7658: tempfile.diff

django/core/files/uploadedfile.py

@@ -3 +3 @@
 """
 
 import os
-import tempfile
 import warnings
 try:
     from cStringIO import StringIO
@@ -12 +11 @@
 
 from django.conf import settings
 
+from django.core.files import temp as tempfile
+
 __all__ = ('UploadedFile', 'TemporaryUploadedFile', 'InMemoryUploadedFile', 'SimpleUploadedFile')
 
 # Because we fooled around with it a bunch, UploadedFile has a bunch

django/core/files/temp.py

@@ +1 @@
+"""
+The temp module defines a NamedTemporaryFile
+that can be re-opened.
+
+This is needed because in Windows NT, the
+default implementation of NamedTemporaryFile
+uses the O_TEMPORARY flag, and thus cannot
+be reopened [1].
+
+1: http://mail.python.org/pipermail/python-list/2005-December/359474.html
+"""
+
+import os
+import tempfile
+
+__all__ = ('NamedTemporaryFile', 'gettempdir',)
+
+class TemporaryFile(object):
+    """
+    Temporary file object constructor that works
+    in Windows and supports reopening of the
+    temporary file in windows.
+    """
+    def __init__(self, mode='w+b', bufsize=-1, suffix='', prefix='', dir=None):
+        fd, name = tempfile.mkstemp(suffix=suffix, prefix=prefix,
+                                      dir=dir)
+        self.name = name
+        self._file = os.fdopen(fd, mode, bufsize)
+
+    def __del__(self):
+        try:
+            self._file.close()
+        except (OSError, IOError):
+            pass
+        try:
+            os.unlink(self.name)
+        except (OSError):
+            pass
+
+        super(TemporaryFile, self).__del__()
+
+
+    def read(self, *args):          return self._file.read(*args)
+    def seek(self, offset):         return self._file.seek(offset)
+    def write(self, s):             return self._file.write(s)
+    def close(self):                return self._file.close()
+    def __iter__(self):             return iter(self._file)
+    def readlines(self, size=None): return self._file.readlines(size)
+    def xreadlines(self):           return self._file.xreadlines()
+
+
+if os.name == 'nt':
+    NamedTemporaryFile = TemporaryFile
+else:
+    NamedTemporaryFile = tempfile.NamedTemporaryFile
+
+gettempdir = tempfile.gettempdir

tests/regressiontests/file_uploads/tests.py

@@ -1 +1 @@
 import os
 import sha
-import tempfile
+from django.core.files import temp as tempfile
 from django.test import TestCase, client
 from django.utils import simplejson