diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-03-11 19:26:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-03-11 19:26:21 (GMT) |
| commit | 86deec19170fe6d0e4e454b2ddab9c2e7cd2869d (patch) | |
| tree | 840aaf06feb1f337673c61366ddd9f9384198641 | |
| parent | f4ce4170efe963d58ed533ad089cb7cfdccad707 (diff) | |
| parent | 8e4b3c7f55766080c3df325e5d06da3c38bb6561 (diff) | |
| download | cpython-86deec19170fe6d0e4e454b2ddab9c2e7cd2869d.zip cpython-86deec19170fe6d0e4e454b2ddab9c2e7cd2869d.tar.gz cpython-86deec19170fe6d0e4e454b2ddab9c2e7cd2869d.tar.bz2 | |
merge 3.3
| -rw-r--r-- | Doc/library/hashlib.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 8f4cd70..d27902e 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -101,18 +101,18 @@ Hashlib provides the following constant attributes: .. data:: algorithms_guaranteed - Contains the names of the hash algorithms guaranteed to be supported + A set containing the names of the hash algorithms guaranteed to be supported by this module on all platforms. .. versionadded:: 3.2 .. data:: algorithms_available - Contains the names of the hash algorithms that are available - in the running Python interpreter. These names will be recognized - when passed to :func:`new`. :attr:`algorithms_guaranteed` - will always be a subset. Duplicate algorithms with different - name formats may appear in this set (thanks to OpenSSL). + A set containing the names of the hash algorithms that are available in the + running Python interpreter. These names will be recognized when passed to + :func:`new`. :attr:`algorithms_guaranteed` will always be a subset. The + same algorithm may appear multiple times in this set under different names + (thanks to OpenSSL). .. versionadded:: 3.2 |