Commit 103d4848 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #7658 -- Added some Windows-specific tempfile handling. The standard 

stuff doesn't work with the way Django's file uploading code wants to operate.
Patch from Mike Axiak.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent e29aece7

django/core/files/temp.py

0 → 100644
+58 −0
Original line number Diff line number Diff line 
"""

The temp module provides a NamedTemporaryFile that can be re-opened on any

platform. Most platforms use the standard Python tempfile.TemporaryFile class,

but MS Windows users are given a custom class.



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',)



if os.name == 'nt':

    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



            try:

                super(TemporaryFile, self).__del__()

            except AttributeError:

                pass





        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()



    NamedTemporaryFile = TemporaryFile

else:

    NamedTemporaryFile = tempfile.NamedTemporaryFile



gettempdir = tempfile.gettempdir

django/core/files/uploadedfile.py

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ Classes representing uploaded files. 
"""



import os

import tempfile

import warnings

try:

    from cStringIO import StringIO
@@ -12,6 +11,8 @@ except ImportError: 


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

tests/regressiontests/file_uploads/tests.py

+14 −14
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ import os 
import errno

import sha

import shutil

import tempfile

import unittest



from django.core.files import temp as tempfile

from django.core.files.uploadedfile import SimpleUploadedFile

from django.test import TestCase, client

from django.utils import simplejson