浏览代码

Reverted "Fixed #26644 -- Allowed wrapping NamedTemporaryFile with File."

This reverts commit 1b407050dd53e56686fdd3e168f8cac4f9be8306 as it
introduces a regression in the test for refs #26772.
Tim Graham 8 年之前
父节点
当前提交
cd217de610
共有 3 个文件被更改,包括 0 次插入18 次删除
  1. 0 4
      django/core/files/base.py
  2. 0 8
      tests/file_storage/tests.py
  3. 0 6
      tests/files/tests.py

+ 0 - 4
django/core/files/base.py

@@ -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
tests/file_storage/tests.py

@@ -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

+ 0 - 6
tests/files/tests.py

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