merge with 3.2

This commit is contained in:
Georg Brandl 2012-02-05 09:28:39 +01:00
commit 2cf04487ac

View file

@ -24,14 +24,14 @@ This module implements the HMAC algorithm as described by :rfc:`2104`.
An HMAC object has the following methods: An HMAC object has the following methods:
.. method:: hmac.update(msg) .. method:: HMAC.update(msg)
Update the hmac object with the bytes object *msg*. Repeated calls are Update the hmac object with the bytes object *msg*. Repeated calls are
equivalent to a single call with the concatenation of all the arguments: equivalent to a single call with the concatenation of all the arguments:
``m.update(a); m.update(b)`` is equivalent to ``m.update(a + b)``. ``m.update(a); m.update(b)`` is equivalent to ``m.update(a + b)``.
.. method:: hmac.digest() .. method:: HMAC.digest()
Return the digest of the bytes passed to the :meth:`update` method so far. Return the digest of the bytes passed to the :meth:`update` method so far.
This bytes object will be the same length as the *digest_size* of the digest This bytes object will be the same length as the *digest_size* of the digest
@ -39,14 +39,14 @@ An HMAC object has the following methods:
bytes. bytes.
.. method:: hmac.hexdigest() .. method:: HMAC.hexdigest()
Like :meth:`digest` except the digest is returned as a string twice the Like :meth:`digest` except the digest is returned as a string twice the
length containing only hexadecimal digits. This may be used to exchange the length containing only hexadecimal digits. This may be used to exchange the
value safely in email or other non-binary environments. value safely in email or other non-binary environments.
.. method:: hmac.copy() .. method:: HMAC.copy()
Return a copy ("clone") of the hmac object. This can be used to efficiently Return a copy ("clone") of the hmac object. This can be used to efficiently
compute the digests of strings that share a common initial substring. compute the digests of strings that share a common initial substring.