Ticket #8690: 8690.diff

django/contrib/formtools/preview.py

@@ -2 +2 @@
 Formtools Preview application.
 """
 
-import cPickle as pickle
-
-from django.conf import settings
 from django.http import Http404
 from django.shortcuts import render_to_response
 from django.template.context import RequestContext
-from django.utils.hashcompat import md5_constructor
 from django.contrib.formtools.utils import security_hash
 
 AUTO_ID = 'formtools_%s' # Each form here uses this as its auto_id parameter.
@@ -25 +21 @@
 
     def __call__(self, request, *args, **kwargs):
         stage = {'1': 'preview', '2': 'post'}.get(request.POST.get(self.unused_name('stage')), 'preview')
-        self.parse_params(*args, **kwargs)
+        import inspect
+        if len(inspect.getargspec(self.parse_params)[0]) == 2:
+            self.parse_params(request, *args, **kwargs)
+        else:
+            self.parse_params(*args, **kwargs)
         try:
             method = getattr(self, stage + '_' + request.method.lower())
         except AttributeError:
@@ -80 +80 @@
 
     # METHODS SUBCLASSES MIGHT OVERRIDE IF APPROPRIATE ########################
 
-    def parse_params(self, *args, **kwargs):
+    def parse_params(self, request, *args, **kwargs):
         """
         Given captured args and kwargs from the URLconf, saves something in
         self.state and/or raises Http404 if necessary.