[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[georg.brandl]

http://hg.python.org/cpython/rev/ca8c2a185aa3
changeset:   74778:ca8c2a185aa3
parent:      74774:b228d9da8bd3
parent:      74777:cd748bab3cdd
user:        Georg Brandl <georg at python.org>
date:        Sun Feb 05 09:28:39 2012 +0100
summary:
  merge with 3.2

files:
  Doc/library/hmac.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
@@ -24,14 +24,14 @@
 
 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
    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)``.
 
 
-.. method:: hmac.digest()
+.. method:: HMAC.digest()
 
    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
@@ -39,14 +39,14 @@
    bytes.
 
 
-.. method:: hmac.hexdigest()
+.. method:: HMAC.hexdigest()
 
    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
    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
    compute the digests of strings that share a common initial substring.

-- 
Repository URL: http://hg.python.org/cpython