test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #26651 -- Kept original file suffix in TemporaryUploadedFile name 

Thanks Tim Graham for the review.
This commit is contained in:
Claude Paroz 2017-06-05 00:05:50 +02:00
parent 45bbb9aae0
commit 6352d06cd0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/core/files/uploadedfile.py
View File

@ -58,7 +58,8 @@ class TemporaryUploadedFile(UploadedFile):
A file uploaded to a temporary location (i.e. stream-to-disk). A file uploaded to a temporary location (i.e. stream-to-disk).
""" """
def __init__(self, name, content_type, size, charset, content_type_extra=None): def __init__(self, name, content_type, size, charset, content_type_extra=None):
file = tempfile.NamedTemporaryFile(suffix='.upload', dir=settings.FILE_UPLOAD_TEMP_DIR) _, ext = os.path.splitext(name)
file = tempfile.NamedTemporaryFile(suffix='.upload' + ext, dir=settings.FILE_UPLOAD_TEMP_DIR)
super().__init__(file, name, content_type, size, charset, content_type_extra) super().__init__(file, name, content_type, size, charset, content_type_extra)
def temporary_file_path(self): def temporary_file_path(self):

10
tests/files/tests.py
View File

@ -12,7 +12,8 @@ from django.core.files.base import ContentFile
from django.core.files.move import file_move_safe from django.core.files.move import file_move_safe
from django.core.files.temp import NamedTemporaryFile from django.core.files.temp import NamedTemporaryFile
from django.core.files.uploadedfile import ( from django.core.files.uploadedfile import (
InMemoryUploadedFile, SimpleUploadedFile, UploadedFile, InMemoryUploadedFile, SimpleUploadedFile, TemporaryUploadedFile,
UploadedFile,
) )
try: try:
@ -214,6 +215,13 @@ class InMemoryUploadedFileTests(unittest.TestCase):
self.assertEqual(f.read(), '1') self.assertEqual(f.read(), '1')
class TemporaryUploadedFileTests(unittest.TestCase):
def test_extension_kept(self):
"""The temporary file name has the same suffix as the original file."""
with TemporaryUploadedFile('test.txt', 'text/plain', 1, 'utf8') as temp_file:
self.assertTrue(temp_file.file.name.endswith('.upload.txt'))
class DimensionClosingBug(unittest.TestCase): class DimensionClosingBug(unittest.TestCase):
""" """
get_image_dimensions() properly closes files (#8817) get_image_dimensions() properly closes files (#8817)