Skip to content

Commit

Permalink
Made content_type_extra optional for TemporaryUploadedFile and Memory…
Browse files Browse the repository at this point in the history
…UploadedFile.

This provides better backwards compatibility for those constructing these
objects manually.

Refs #13721.
  • Loading branch information
YDS19872712 authored and timgraham committed Feb 18, 2014
1 parent 621c5cf commit d3e33ff
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions django/core/files/uploadedfile.py
Expand Up @@ -60,7 +60,7 @@ 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): def __init__(self, name, content_type, size, charset, content_type_extra=None):
if settings.FILE_UPLOAD_TEMP_DIR: if settings.FILE_UPLOAD_TEMP_DIR:
file = tempfile.NamedTemporaryFile(suffix='.upload', file = tempfile.NamedTemporaryFile(suffix='.upload',
dir=settings.FILE_UPLOAD_TEMP_DIR) dir=settings.FILE_UPLOAD_TEMP_DIR)
Expand Down Expand Up @@ -89,7 +89,7 @@ class InMemoryUploadedFile(UploadedFile):
""" """
A file uploaded into memory (i.e. stream-to-memory). A file uploaded into memory (i.e. stream-to-memory).
""" """
def __init__(self, file, field_name, name, content_type, size, charset, content_type_extra): def __init__(self, file, field_name, name, content_type, size, charset, content_type_extra=None):
super(InMemoryUploadedFile, self).__init__(file, name, content_type, size, charset, content_type_extra) super(InMemoryUploadedFile, self).__init__(file, name, content_type, size, charset, content_type_extra)
self.field_name = field_name self.field_name = field_name


Expand Down

0 comments on commit d3e33ff

Please sign in to comment.