[Python-checkins] cpython (merge default -> default): merge heads
lukasz.langa
python-checkins at python.org
Sat Jun 11 21:07:38 EDT 2016
https://hg.python.org/cpython/rev/795502f83718
changeset: 101908:795502f83718
parent: 101907:389b7456a053
parent: 101905:1cfd627bee05
user: Łukasz Langa <lukasz at langa.pl>
date: Sat Jun 11 18:07:28 2016 -0700
summary:
merge heads
files:
Doc/library/hashlib.rst | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -104,7 +104,9 @@
.. data:: algorithms_guaranteed
A set containing the names of the hash algorithms guaranteed to be supported
- by this module on all platforms.
+ by this module on all platforms. Note that 'md5' is in this list despite
+ some upstream vendors offering an odd "FIPS compliant" Python build that
+ excludes it.
.. versionadded:: 3.2
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list