Commit 17155d38 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

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

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8e14a4e6

django/contrib/formtools/preview.py

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ class FormPreview(object): 
        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)

django/contrib/formtools/wizard.py

+2 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ class FormWizard(object): 
        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 @@ class FormWizard(object): 
            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,