fix cgi.FieldStorage 'multipart/form-data' parsing (the field names are not unquoted). see also https://bitbucket.org/ianb/webob/issue/2

1 files changed, 10 insertions, 3 deletions

diff --git a/webob/multidict.py b/webob/multidict.py
index 16f05bb..8965686 100644
--- a/webob/multidict.py
+++ b/webob/multidict.py
@@ -3,7 +3,7 @@
 """
 Gives a multi-value dictionary object (MultiDict) plus several wrappers
 """
-import cgi, copy, sys, warnings
+import cgi, copy, sys, warnings, urllib
 from UserDict import DictMixin
 
 
@@ -53,12 +53,19 @@ class MultiDict(DictMixin):
         Create a dict from a cgi.FieldStorage instance
         """
         obj = cls()
+        if fs.type == 'multipart/form-data':
+            # cgi.FieldStorage parser for this ctype
+            # does not unquote the field names
+            fix_name = urllib.unquote
+        else:
+            fix_name = lambda n: n
         # fs.list can be None when there's nothing to parse
         for field in fs.list or ():
+            name = fix_name(field.name)
             if field.filename:
-                obj.add(field.name, field)
+                obj.add(name, field)
             else:
-                obj.add(field.name, field.value)
+                obj.add(name, field.value)
         return obj
 
     def __getitem__(self, key):