merge 3.3 (closes #16687)

This commit is contained in:
Benjamin Peterson 2012-12-20 20:25:00 -06:00
commit 301162b43d
1 changed files with 2 additions and 2 deletions

View File

@ -40,12 +40,12 @@ concatenation of the data fed to it so far using the :meth:`digest` or
.. note:: .. note::
For better multithreading performance, the Python GIL is released for For better multithreading performance, the Python :term:`GIL` is released for
strings of more than 2047 bytes at object creation or on update. strings of more than 2047 bytes at object creation or on update.
.. note:: .. note::
Feeding string objects is to :meth:`update` is not supported, as hashes work Feeding string objects into :meth:`update` is not supported, as hashes work
on bytes, not on characters. on bytes, not on characters.
.. index:: single: OpenSSL; (use in module hashlib) .. index:: single: OpenSSL; (use in module hashlib)