Ticket #16236: formwizard_form_initkwargs.diff

django/contrib/formtools/wizard/tests/formtests.py

@@ -35 +35 @@
 class Step3(forms.Form):
     data = forms.CharField()
 
+class CustomKwargsForm(forms.Form):
+    name = forms.CharField()
+
+    def __init__(self, test=None, *args, **kwargs):
+        return super(CustomKwargsForm, self).__init__(*args, **kwargs)
+
 class UserForm(forms.ModelForm):
     class Meta:
         model = User
@@ -48 +54 @@
         response = super(TestWizard, self).dispatch(request, *args, **kwargs)
         return response, self
 
+    def get_form_kwargs(self, step, **kwargs):
+        kwargs = super(TestWizard, self).get_form_kwargs(step, **kwargs)
+        if step == 'kwargs_test':
+            kwargs['test'] = True
+        return kwargs
+
 class FormTests(TestCase):
     def test_form_init(self):
         testform = TestWizard.get_initkwargs([Step1, Step2])
@@ -102 +114 @@
         response, instance = testform(request)
         self.assertEquals(instance.get_next_step(), 'step3')
 
+    def test_form_kwargs(self):
+        request = get_request()
+
+        testform = TestWizard.as_view([('start', Step1),
+            ('kwargs_test', CustomKwargsForm)])
+        response, instance = testform(request)
+
+        self.assertTrue('test' not in instance.get_form_kwargs('start'))
+        self.assertTrue('test' in instance.get_form_kwargs('kwargs_test'))
+
     def test_form_prefix(self):
         request = get_request()
 

django/contrib/formtools/wizard/views.py

@@ -366 +366 @@
         if step is None:
             step = self.steps.current
         # prepare the kwargs for the form instance.
+        kwargs = self.get_form_kwargs(step, data=data, files=files)
+        return self.form_list[step](**kwargs)
+
+    def get_form_kwargs(self, step, data=None, files=None):
+        """
+        Returns the keyword arguments for instantiating the form (or formset)
+        on given step.
+        """
         kwargs = {
             'data': data,
             'files': files,
@@ -378 +386 @@
         elif issubclass(self.form_list[step], forms.models.BaseModelFormSet):
             # If the form is based on ModelFormSet, add queryset if available.
             kwargs.update({'queryset': self.get_form_instance(step)})
-        return self.form_list[step](**kwargs)
+        return kwargs
 
     def process_step(self, form):
         """