Fixed #7590: made UploadedFile subclasses' __init__ methods sane.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7817 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 15 insertions, 5 deletions

diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py
index 034953972a..ab587769f7 100644
--- a/django/core/files/uploadhandler.py
+++ b/django/core/files/uploadhandler.py
@@ -140,9 +140,13 @@ class TemporaryFileUploadHandler(FileUploadHandler):
 
     def file_complete(self, file_size):
         self.file.seek(0)
-        return TemporaryUploadedFile(self.file, self.file_name,
-                                     self.content_type, file_size,
-                                     self.charset)
+        return TemporaryUploadedFile(
+            file = self.file, 
+            file_name = self.file_name, 
+            content_type = self.content_type, 
+            file_size = file_size, 
+            charset = self.charset
+        )
 
 class MemoryFileUploadHandler(FileUploadHandler):
     """
@@ -182,8 +186,14 @@ class MemoryFileUploadHandler(FileUploadHandler):
         if not self.activated:
             return
 
-        return InMemoryUploadedFile(self.file, self.field_name, self.file_name,
-                                    self.content_type, self.charset, file_size)
+        return InMemoryUploadedFile(
+            file = self.file,
+            field_name = self.field_name,
+            file_name = self.file_name,
+            content_type = self.content_type,
+            file_size = file_size,
+            charset = self.charset
+        )
 
 class TemporaryFile(object):
     """