Ticket #7038: django.contrib.formtools.7828.patch

django/contrib/formtools/wizard.py

@@ -146 +146 @@
         Subclasses may want to take into account request-specific information,
         such as the IP address.
         """
-        data = [(bf.name, bf.data or '') for bf in form] + [settings.SECRET_KEY]
+        data = [settings.SECRET_KEY]
+        for bf in form:
+            d = unicode(bf.data) if bf.data is not None else ''
+            n = bf.name
+            data.append((n,d))
         # Use HIGHEST_PROTOCOL because it's the most efficient. It requires
         # Python 2.3, but Django requires 2.3 anyway, so that's OK.
         pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL)