summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-07-01 18:49:01 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-07-01 18:49:01 +0000
commitbcb1c6dc7167039e715b3399bcc46cbeb5f2d8d1 (patch)
treec117da349f3178ed2ce7cff771514cc5fe4a7834
parent9fc4c0aaa4ee145c917a0ece6e6828596e00cce1 (diff)
Oops, missed a changed file in [7817].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/files/uploadedfile.py4
1 files 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)