mirror of
https://github.com/django/django.git
synced 2025-01-03 06:55:47 +00:00
Reverted "Fixed #26644 -- Allowed wrapping NamedTemporaryFile with File."
This reverts commit 1b407050dd
as it
introduces a regression in the test for refs #26772.
This commit is contained in:
parent
625b8e9295
commit
cd217de610
@ -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
|
||||
|
@ -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
|
||||
@ -860,13 +859,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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user