Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (4 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/comments/models.py

    r7979 r8215  
    3030        validate that submitted form options have not been tampered-with. 
    3131        """ 
    32         import md5 
    33         return md5.new(options + photo_options + rating_options + target + settings.SECRET_KEY).hexdigest() 
     32        from django.utils.hashcompat import md5_constructor 
     33        return md5_constructor(options + photo_options + rating_options + target + settings.SECRET_KEY).hexdigest() 
    3434 
    3535    def get_rating_options(self, rating_string):