Changeset 8215 for django/branches/gis/django/contrib/formtools
- Timestamp:
- 08/05/08 12:15:33 (4 months ago)
- Files:
-
- django/branches/gis (modified) (1 prop)
- django/branches/gis/django/contrib/formtools/preview.py (modified) (3 diffs)
- django/branches/gis/django/contrib/formtools/tests.py (modified) (1 diff)
- django/branches/gis/django/contrib/formtools/wizard.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/gis
- Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214
django/branches/gis/django/contrib/formtools/preview.py
r7279 r8215 2 2 Formtools Preview application. 3 3 """ 4 5 import cPickle as pickle 4 6 5 7 from django.conf import settings … … 7 9 from django.shortcuts import render_to_response 8 10 from django.template.context import RequestContext 9 import cPickle as pickle 10 import md5 11 from django.utils.hashcompat import md5_constructor 11 12 12 13 AUTO_ID = 'formtools_%s' # Each form here uses this as its auto_id parameter. … … 110 111 # Python 2.3, but Django requires 2.3 anyway, so that's OK. 111 112 pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL) 112 return md5 .new(pickled).hexdigest()113 return md5_constructor(pickled).hexdigest() 113 114 114 115 def failed_hash(self, request): django/branches/gis/django/contrib/formtools/tests.py
r7979 r8215 2 2 from django.contrib.formtools import preview 3 3 from django import http 4 from django.conf import settings5 4 from django.test import TestCase 6 5 django/branches/gis/django/contrib/formtools/wizard.py
r7979 r8215 5 5 """ 6 6 7 import cPickle as pickle 8 7 9 from django import forms 8 10 from django.conf import settings … … 10 12 from django.shortcuts import render_to_response 11 13 from django.template.context import RequestContext 12 import cPickle as pickle 13 import md5 14 from django.utils.hashcompat import md5_constructor 14 15 15 16 class FormWizard(object): … … 151 152 # Python 2.3, but Django requires 2.3 anyway, so that's OK. 152 153 pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL) 153 return md5 .new(pickled).hexdigest()154 return md5_constructor(pickled).hexdigest() 154 155 155 156 def determine_step(self, request, *args, **kwargs):
