Fixed corner-case bug in formtools wizard.py and preview.py, in case of a None value -- thanks, Honza

adrianholovaty · adrianholovaty · commit 17155d38459d · 2008-03-18T00:17:59.000Z
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/contrib/formtools/preview.py b/django/contrib/formtools/preview.py
@@ -105,7 +105,7 @@ def security_hash(self, request, form):
         Subclasses may want to take into account request-specific information
         such as the IP address.
         """
-        data = [(bf.name, bf.data) for bf in form] + [settings.SECRET_KEY]
+        data = [(bf.name, bf.data or '') for bf in form] + [settings.SECRET_KEY]
         # 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)
diff --git a/django/contrib/formtools/wizard.py b/django/contrib/formtools/wizard.py
@@ -146,7 +146,7 @@ def security_hash(self, request, form):
         Subclasses may want to take into account request-specific information,
         such as the IP address.
         """
-        data = [(bf.name, bf.data) for bf in form] + [settings.SECRET_KEY]
+        data = [(bf.name, bf.data or '') for bf in form] + [settings.SECRET_KEY]
         # 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, protocol=pickle.HIGHEST_PROTOCOL)
@@ -198,6 +198,7 @@ def render_template(self, request, form, previous_fields, step, context=None):
             step_field -- The name of the hidden field containing the step.
             step0      -- The current step (zero-based).
             step       -- The current step (one-based).
+            step_count -- The total number of steps.
             form       -- The Form instance for the current step (either empty
                           or with errors).
             previous_fields -- A string representing every previous data field,
