Ticket #2976: fileupload-repr.patch

http/__init__.py

@@ -2 +2 @@
 from Cookie import SimpleCookie
 from pprint import pformat
 from urllib import urlencode, quote
-from django.utils.datastructures import MultiValueDict
+from django.utils.datastructures import MultiValueDict, FileUploadDict
 
 RESERVED_CHARS="!*'();:@&=+$,/?%#[]"
 
@@ -64 +64 @@
                 # IE submits the full path, so trim everything but the basename.
                 # (We can't use os.path.basename because it expects Linux paths.)
                 filename = name_dict['filename'][name_dict['filename'].rfind("\\")+1:]
-                FILES.appendlist(name_dict['name'], {
+                FILES.appendlist(name_dict['name'], FileUploadDict({
                     'filename': filename,
                     'content-type': (submessage.has_key('Content-Type') and submessage['Content-Type'] or None),
                     'content': submessage.get_payload(),
-                })
+                }))
             else:
                 POST.appendlist(name_dict['name'], submessage.get_payload())
     return POST, FILES

utils/datastructures.py

@@ -242 +242 @@
                 current[bits[-1]] = v
             except TypeError: # Special-case if current isn't a dict.
                 current = {bits[-1] : v}
+
+class FileUploadDict(dict):
+    def __repr__(self):
+        copy = self.copy()
+        copy['content_length'] = len(copy.pop('content'))
+        return repr(copy)