From 875ce287e25d7576f9bd102f86adae09d242360f Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 31 May 2014 13:50:07 -0700 Subject: [PATCH] Note that the stdlib's version of pbkdf2_hmac will also be used in the upcoming Python 2.7.8 release --- django/utils/crypto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/utils/crypto.py b/django/utils/crypto.py index cbf2656316..3cf40a4848 100644 --- a/django/utils/crypto.py +++ b/django/utils/crypto.py @@ -128,7 +128,7 @@ if hasattr(hashlib, "pbkdf2_hmac"): Implements PBKDF2 with the same API as Django's existing implementation, using the stdlib. - This is used in Python 3.4 and up. + This is used in Python 2.7.8+ and 3.4+. """ if digest is None: digest = hashlib.sha256