Commit bcb1c6dc authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Oops, missed a changed file in [7817]. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9fc4c0aa

django/core/files/uploadedfile.py

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ class InMemoryUploadedFile(UploadedFile): 
    """

    A file uploaded into memory (i.e. stream-to-memory).

    """

    def __init__(self, file, field_name, file_name, content_type, charset, file_size):

        super(InMemoryUploadedFile, self).__init__(file_name, content_type, charset, file_size)

    def __init__(self, file, field_name, file_name, content_type, file_size, charset):

        super(InMemoryUploadedFile, self).__init__(file_name, content_type, file_size, charset)

        self.file = file

        self.field_name = field_name

        self.file.seek(0)