summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-06-18 11:06:10 -0400
committerTim Graham <timograham@gmail.com>2016-06-18 12:46:34 -0400
commite2b266fdf78141a45277fb1664a6d430d7731c09 (patch)
tree05cac58071b541572ca3bcf46d9e3abb92e321d2
parent31a789f646d0d9af3e8464f2f9a06aa018df5f90 (diff)
[1.10.x] Reverted "Fixed #26644 -- Allowed wrapping NamedTemporaryFile with File."
This reverts commit 1b407050dd53e56686fdd3e168f8cac4f9be8306 as it introduces a regression in the test for refs #26772. Backport of cd217de6100e0101fd921dd18bc2e706bac397c9 from master
-rw-r--r--django/core/files/base.py4
-rw-r--r--tests/file_storage/tests.py8
-rw-r--r--tests/files/tests.py6
3 files changed, 0 insertions, 18 deletions
diff --git a/django/core/files/base.py b/django/core/files/base.py
index 0b7bbdc251..a27d363658 100644
--- a/django/core/files/base.py
+++ b/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
diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py
index 9f50ff06e7..ee708d5350 100644
--- a/tests/file_storage/tests.py
+++ b/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
@@ -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
diff --git a/tests/files/tests.py b/tests/files/tests.py
index cd15a80f7e..93388d25de 100644
--- a/tests/files/tests.py
+++ b/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)