summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-31 13:50:07 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-31 13:50:07 -0700
commit875ce287e25d7576f9bd102f86adae09d242360f (patch)
tree7a83910e639d0e5c36d695166c6c18e99b0ff505
parenta31d7c48b028ec4c4b650b33b540bbe987d28a1d (diff)
Note that the stdlib's version of pbkdf2_hmac will also be used in the upcoming Python 2.7.8 release
-rw-r--r--django/utils/crypto.py2
1 files changed, 1 insertions, 1 deletions
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