Ticket #7439: multipart_form_as_last_in_formwizard.diff

contrib/formtools/wizard.py

@@ -42 +42 @@
     def __repr__(self):
         return "step: %d\nform_list: %s\ninitial_data: %s" % (self.step, self.form_list, self.initial)
 
-    def get_form(self, step, data=None):
+    def get_form(self, step, data=None, files=None):
         "Helper method that returns the Form instance for the given step."
-        return self.form_list[step](data, prefix=self.prefix_for_step(step), initial=self.initial.get(step, None))
+        return self.form_list[step](data, files, prefix=self.prefix_for_step(step), initial=self.initial.get(step, None))
 
     def num_steps(self):
         "Helper method that returns the number of steps."
@@ -71 +71 @@
         # For each previous step, verify the hash and process.
         # TODO: Move "hash_%d" to a method to make it configurable.
         for i in range(current_step):
-            form = self.get_form(i, request.POST)
+            form = self.get_form(i, request.POST, request.FILES)
             if request.POST.get("hash_%d" % i, '') != self.security_hash(request, form):
                 return self.render_hash_failure(request, i)
             self.process_step(request, form, i)
@@ -79 +79 @@
         # Process the current step. If it's valid, go to the next step or call
         # done(), depending on whether any steps remain.
         if request.method == 'POST':
-            form = self.get_form(current_step, request.POST)
+            form = self.get_form(current_step, request.POST, request.FILES)
         else:
             form = self.get_form(current_step)
         if form.is_valid():
@@ -90 +90 @@
             # time, as a sanity check, and call done().
             num = self.num_steps()
             if next_step == num:
-                final_form_list = [self.get_form(i, request.POST) for i in range(num)]
+                final_form_list = [self.get_form(i, request.POST, request.FILES) for i in range(num)]
 
                 # Validate all the forms. If any of them fail validation, that
                 # must mean the validator relied on some other input, such as
@@ -102 +102 @@
 
             # Otherwise, move along to the next step.
             else:
+                if form.is_multipart():
+                    raise NotImplementedError("Your %s class has not initialized multipart form as last." % self.__class__.__name__)
                 form = self.get_form(next_step)
                 self.step = current_step = next_step