diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2016-06-11 17:45:11 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-06-11 20:45:11 -0400 |
| commit | cd88faa62837cef226508d5aa915056dbf934823 (patch) | |
| tree | 3868c65c2b362631e66a09e8809b3dd829c69f34 /django/core | |
| parent | bb7bb379e8cd91a91336946829519d64e919a1d2 (diff) | |
Removed unnecessary check in TemporaryUploadedFile.
If settings.FILE_UPLOAD_TEMP_DIR is the default value of None,
NamedTemporaryFile will work the same as if nothing was passed.
Diffstat (limited to 'django/core')
| -rw-r--r-- | django/core/files/uploadedfile.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/django/core/files/uploadedfile.py b/django/core/files/uploadedfile.py index 156c35a1ed..6f71fc3b95 100644 --- a/django/core/files/uploadedfile.py +++ b/django/core/files/uploadedfile.py @@ -61,10 +61,7 @@ class TemporaryUploadedFile(UploadedFile): A file uploaded to a temporary location (i.e. stream-to-disk). """ def __init__(self, name, content_type, size, charset, content_type_extra=None): - if settings.FILE_UPLOAD_TEMP_DIR: - file = tempfile.NamedTemporaryFile(suffix='.upload', dir=settings.FILE_UPLOAD_TEMP_DIR) - else: - file = tempfile.NamedTemporaryFile(suffix='.upload') + file = tempfile.NamedTemporaryFile(suffix='.upload', dir=settings.FILE_UPLOAD_TEMP_DIR) super(TemporaryUploadedFile, self).__init__(file, name, content_type, size, charset, content_type_extra) def temporary_file_path(self): |