summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2016-06-12 01:07:28 (GMT)
committerŁukasz Langa <lukasz@langa.pl>2016-06-12 01:07:28 (GMT)
commit4f62d38cf8ea8b2587de278aa99a2a4b0a8d984c (patch)
tree310621b6f951f34992bae632341768eda53551eb
parent34ad2ef8f9a2fb506389b8c6b490f2ef19b5ff40 (diff)
parent7bfb415c8d1e74b2dcc46bb36d4a853e2adb4d39 (diff)
downloadcpython-4f62d38cf8ea8b2587de278aa99a2a4b0a8d984c.zip
cpython-4f62d38cf8ea8b2587de278aa99a2a4b0a8d984c.tar.gz
cpython-4f62d38cf8ea8b2587de278aa99a2a4b0a8d984c.tar.bz2
merge heads
-rw-r--r--Doc/library/hashlib.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 085f99d..93bcc91 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -104,7 +104,9 @@ Hashlib provides the following constant attributes:
.. 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