summaryrefslogtreecommitdiffstats
path: root/Doc/library/hashlib.rst
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2010-03-01 02:05:26 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2010-03-01 02:05:26 (GMT)
commit86508cc88bc00e3891d8efe4fbb79cacd40c9b69 (patch)
tree7d043cca2d8d5e67b693d51808dcd37f3db369a0 /Doc/library/hashlib.rst
parenta59c59f9460ddc9c9a54965414c60be50ee5873b (diff)
downloadcpython-86508cc88bc00e3891d8efe4fbb79cacd40c9b69.zip
cpython-86508cc88bc00e3891d8efe4fbb79cacd40c9b69.tar.gz
cpython-86508cc88bc00e3891d8efe4fbb79cacd40c9b69.tar.bz2
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. ........
Diffstat (limited to 'Doc/library/hashlib.rst')
-rw-r--r--Doc/library/hashlib.rst9
1 files changed, 9 insertions, 0 deletions
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 @@ Using :func:`new` with an algorithm provided by OpenSSL:
>>> 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: