Ticket #19020: 19020-patch1.diff

django/contrib/formtools/tests/__init__.py

@@ -218 +218 @@
 )
 class WizardTests(TestCase):
     urls = 'django.contrib.formtools.tests.urls'
-    input_re = re.compile('name="([^"]+)" value="([^"]+)"')
+    name_re = re.compile('name="([^"]+)"')
+    value_re = re.compile('value="([^"]+)"')
     wizard_step_data = (
         {
             '0-name': 'Pony',
@@ -410 +411 @@
         Pull the appropriate field data from the context to pass to the next wizard step
         """
         previous_fields = response.context['previous_fields']
-        fields = {'wizard_step': response.context['step0']}
-
-        def grab(m):
-            fields[m.group(1)] = m.group(2)
-            return ''
-
-        self.input_re.sub(grab, previous_fields)
+        fields = dict(zip(
+            self.name_re.findall(previous_fields),
+            self.value_re.findall(previous_fields)))
+        fields['wizard_step'] = response.context['step0']
         return fields
 
     def check_wizard_step(self, response, step_no):

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

@@ -2 +2 @@
 from django.core import signing
 from django.core.exceptions import SuspiciousOperation
 from django.http import HttpResponse
+from django.utils import simplejson as json
 
 from django.contrib.formtools.wizard.storage.cookie import CookieStorage
 from django.contrib.formtools.tests.wizard.storage import get_request, TestStorage
@@ -41 +42 @@
         storage.init_data()
         storage.update_response(response)
         unsigned_cookie_data = cookie_signer.unsign(response.cookies[storage.prefix].value)
-        self.assertEqual(unsigned_cookie_data, '{"step_files":{},"step":null,"extra_data":{},"step_data":{}}')
+        self.assertEqual(json.loads(unsigned_cookie_data), {"step_files":{},"step":None,"extra_data":{},"step_data":{}})