Commit d3e33fff authored by Dmitro's avatar Dmitro Committed by Tim Graham
Browse files

Made content_type_extra optional for TemporaryUploadedFile and MemoryUploadedFile. 

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

Refs #13721.
parent 621c5cf4

django/core/files/uploadedfile.py

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,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):

    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)
@@ -89,7 +89,7 @@ class InMemoryUploadedFile(UploadedFile): 
    """

    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)

        self.field_name = field_name