[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Sun Oct 6 18:26:01 CEST 2013
http://hg.python.org/cpython/rev/5822cc9671ed
changeset: 86101:5822cc9671ed
parent: 86099:3b5150dea580
parent: 86100:1f1e556fe06e
user: Georg Brandl <georg at python.org>
date: Sun Oct 06 18:26:43 2013 +0200
summary:
merge with 3.3
files:
Doc/library/hashlib.rst | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -23,12 +23,14 @@
digests. The modern term is secure hash.
.. note::
- If you want the adler32 or crc32 hash functions they are available in
+
+ If you want the adler32 or crc32 hash functions, they are available in
the :mod:`zlib` module.
.. warning::
- Some algorithms have known hash collision weaknesses, see the FAQ at the end.
+ Some algorithms have known hash collision weaknesses, refer to the "See
+ also" section at the end.
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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list