summaryrefslogtreecommitdiff
path: root/Doc/library/hashlib.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-05-04 18:07:12 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2013-05-04 18:07:12 +0300
commit4cfc0b5411354323433031b5e03862def2f00234 (patch)
tree63cf0326905fcd23cd4050dee6fb01440486b853 /Doc/library/hashlib.rst
parent4e59af7abddc7c43a6f52b571fcd65fc55e5f861 (diff)
parentc228e96726129e20519a2016075fca3dc9fdcd30 (diff)
downloadcpython-git-4cfc0b5411354323433031b5e03862def2f00234.tar.gz
#16518: merge with 3.3.
Diffstat (limited to 'Doc/library/hashlib.rst')
-rw-r--r--Doc/library/hashlib.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index f0fe915ce5..6cb76c133f 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -32,9 +32,9 @@ digests. The modern term is secure hash.
There is one constructor method named for each type of :dfn:`hash`. All return
a hash object with the same simple interface. For example: use :func:`sha1` to
-create a SHA1 hash object. You can now feed this object with objects conforming
-to the buffer interface (normally :class:`bytes` objects) using the
-:meth:`update` method. At any point you can ask it for the :dfn:`digest` of the
+create a SHA1 hash object. You can now feed this object with :term:`bytes-like
+object`\ s (normally :class:`bytes`) using the :meth:`update` method.
+At any point you can ask it for the :dfn:`digest` of the
concatenation of the data fed to it so far using the :meth:`digest` or
:meth:`hexdigest` methods.