Merged revisions 78528 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78528 | gregory.p.smith | 2010-02-28 18:01:47 -0800 (Sun, 28 Feb 2010) | 2 lines

  Adds the hashlib.algorithms attribute.  See issue7418.
........
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index a776df1..3c98af7 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -82,6 +82,15 @@
    >>> h.hexdigest()
    'cc4a5ce1b3df48aec5d22d1f16b894a0b894eccc'
 
+This module provides the following constant attribute:
+
+.. data:: hashlib.algorithms
+
+   A tuple providing the names of the hash algorithms guaranteed to be
+   supported by this module.
+
+   .. versionadded:: 3.2
+
 The following values are provided as constant attributes of the hash objects
 returned by the constructors: