Browse files

Fixed #13653: Fixed django.utils.hashcompat to support running on Pyt…

…hon 2.4 with standalone hashlib.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 526a441 commit adc9458541385ce71935f328fa03cb7e48b8962e @kmtracey kmtracey committed May 28, 2010
Showing with 4 additions and 4 deletions.
  1. +4 −4 django/utils/hashcompat.py
View
8 django/utils/hashcompat.py
@@ -1,17 +1,17 @@
"""
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
-interface to the md5 and sha constructors, preferring the hashlib module when
-available.
+interface to the md5 and sha constructors, depending on system version.
"""
-try:
+import sys
+if sys.version_info >= (2, 5):
import hashlib
md5_constructor = hashlib.md5
md5_hmac = md5_constructor
sha_constructor = hashlib.sha1
sha_hmac = sha_constructor
-except ImportError:
+else:
import md5
md5_constructor = md5.new
md5_hmac = md5

0 comments on commit adc9458

Please sign in to comment.