Ticket #16393: trac-16393.diff

django/contrib/formtools/wizard/storage/cookie.py

@@ -1 +1 @@
 from django.core.exceptions import SuspiciousOperation
 from django.core.signing import BadSignature
 from django.utils import simplejson as json
+from django.utils.datastructures import MultiValueDict
 
 from django.contrib.formtools.wizard import storage
 
@@ -23 +24 @@
             raise SuspiciousOperation('FormWizard cookie manipulated')
         if data is None:
             return None
-        return json.loads(data, cls=json.JSONDecoder)
+
+        json_data = json.loads(data, cls=json.JSONDecoder)
+        if self.step_data_key in json_data:
+            for step, form_data in json_data[self.step_data_key].iteritems():
+                form_dict = MultiValueDict()
+                for key, value in form_data.items():
+                    if isinstance(value, list):
+                        form_dict.setlist(key, value)
+                    else:
+                        form_dict[key] = value
+                json_data[self.step_data_key][step] = form_dict
+        return json_data