From adc9458541385ce71935f328fa03cb7e48b8962e Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Fri, 28 May 2010 11:46:03 +0000 Subject: [PATCH] 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 --- django/utils/hashcompat.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django/utils/hashcompat.py b/django/utils/hashcompat.py index b1e6021890c..4d9b76f3a67 100644 --- a/django/utils/hashcompat.py +++ b/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