merge 3.3

This commit is contained in:
Benjamin Peterson 2014-03-11 14:26:21 -05:00
commit 86deec1917
1 changed files with 6 additions and 6 deletions

View File

@ -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