Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

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/wizard.py

    r7979 r8215  
    55""" 
    66 
     7import cPickle as pickle 
     8 
    79from django import forms 
    810from django.conf import settings 
    …… 
    1012from django.shortcuts import render_to_response 
    1113from django.template.context import RequestContext 
    12 import cPickle as pickle 
    13 import md5 
     14from django.utils.hashcompat import md5_constructor 
    1415 
    1516class FormWizard(object): 
    …… 
    151152        # Python 2.3, but Django requires 2.3 anyway, so that's OK. 
    152153        pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL) 
    153         return md5.new(pickled).hexdigest() 
     154        return md5_constructor(pickled).hexdigest() 
    154155 
    155156    def determine_step(self, request, *args, **kwargs):