diff options
Diffstat (limited to 'django/utils/hashcompat.py')
| -rw-r--r-- | django/utils/hashcompat.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/django/utils/hashcompat.py b/django/utils/hashcompat.py index 57435b14be..b11fa0a686 100644 --- a/django/utils/hashcompat.py +++ b/django/utils/hashcompat.py @@ -3,22 +3,13 @@ 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, depending on system version. """ -import sys -import warnings +import warnings warnings.warn("django.utils.hashcompat is deprecated; use hashlib instead", PendingDeprecationWarning) -if sys.version_info >= (2, 5): - import hashlib - md5_constructor = hashlib.md5 - md5_hmac = md5_constructor - sha_constructor = hashlib.sha1 - sha_hmac = sha_constructor -else: - import md5 - md5_constructor = md5.new - md5_hmac = md5 - import sha - sha_constructor = sha.new - sha_hmac = sha +import hashlib +md5_constructor = hashlib.md5 +md5_hmac = md5_constructor +sha_constructor = hashlib.sha1 +sha_hmac = sha_constructor |