From bcb1c6dc7167039e715b3399bcc46cbeb5f2d8d1 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 1 Jul 2008 18:49:01 +0000 Subject: [PATCH] Oops, missed a changed file in [7817]. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7818 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/files/uploadedfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/core/files/uploadedfile.py b/django/core/files/uploadedfile.py index 51cec172d4..d6363b77e2 100644 --- a/django/core/files/uploadedfile.py +++ b/django/core/files/uploadedfile.py @@ -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)