Commit e2b266fd authored by Tim Graham's avatar Tim Graham
Browse files

[1.10.x] Reverted "Fixed #26644 -- Allowed wrapping NamedTemporaryFile with File."

This reverts commit 1b407050 as it
introduces a regression in the test for refs #26772.

Backport of cd217de6 from master
parent 31a789f6
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ class File(FileProxyMixin):
        self.file = file
        if name is None:
            name = getattr(file, 'name', None)
        # Use only the basename from a file's name if it's an absolute path,
        # e.g. from NamedTemporaryFile.
        if isinstance(name, six.string_types) and os.path.isabs(name):
            name = os.path.basename(name)
        self.name = name
        if hasattr(file, 'mode'):
            self.mode = file.mode
+0 −8
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ import threading
import time
import unittest
from datetime import datetime, timedelta
from tempfile import NamedTemporaryFile

from django.core.cache import cache
from django.core.exceptions import SuspiciousFileOperation, SuspiciousOperation
@@ -862,13 +861,6 @@ class FileFieldStorageTests(TestCase):
        with temp_storage.open('tests/stringio') as f:
            self.assertEqual(f.read(), b'content')

    def test_save_temporary_file(self):
        storage = Storage()
        with NamedTemporaryFile() as f:
            f.write(b'content')
            storage.normal = File(f)
            storage.save()  # no crash


# Tests for a race condition on file saving (#4948).
# This is written in such a way that it'll always pass on platforms
+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ else:


class FileTests(unittest.TestCase):

    def test_file_truncates_namedtemporaryfile_name(self):
        named_file = NamedTemporaryFile()
        f = File(named_file)
        self.assertEqual(f.name, os.path.basename(named_file.name))

    def test_unicode_uploadedfile_name(self):
        uf = UploadedFile(name='¿Cómo?', content_type='text')
        self.assertIs(type(repr(uf)), str)