innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #13653: Fixed django.utils.hashcompat to support running on Python 2.4 with standalone hashlib. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2010-05-28 11:46:03 +00:00
parent 526a4410d7
commit adc9458541
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/utils/hashcompat.py
View File

@ -1,17 +1,17 @@
""" """
The md5 and sha modules are deprecated since Python 2.5, replaced by the The md5 and sha modules are deprecated since Python 2.5, replaced by the
hashlib module containing both hash algorithms. Here, we provide a common hashlib module containing both hash algorithms. Here, we provide a common
interface to the md5 and sha constructors, preferring the hashlib module when interface to the md5 and sha constructors, depending on system version.
available.
""" """
try: import sys
if sys.version_info >= (2, 5):
import hashlib import hashlib
md5_constructor = hashlib.md5 md5_constructor = hashlib.md5
md5_hmac = md5_constructor md5_hmac = md5_constructor
sha_constructor = hashlib.sha1 sha_constructor = hashlib.sha1
sha_hmac = sha_constructor sha_hmac = sha_constructor
except ImportError: else:
import md5 import md5
md5_constructor = md5.new md5_constructor = md5.new
md5_hmac = md5 md5_hmac = md5