diff options
| author | Georg Brandl <georg@python.org> | 2010-07-04 17:33:33 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-07-04 17:33:33 (GMT) |
| commit | 31a0f86e368c980b751bdc0b377e42322cf2566d (patch) | |
| tree | edbf9b91a59d40cfce91ba657364fdcac6be3d07 /Doc/library | |
| parent | 1b84b5fd6422fbedbd038a9774df8d8904a66367 (diff) | |
| download | cpython-31a0f86e368c980b751bdc0b377e42322cf2566d.zip cpython-31a0f86e368c980b751bdc0b377e42322cf2566d.tar.gz cpython-31a0f86e368c980b751bdc0b377e42322cf2566d.tar.bz2 | |
Merged revisions 77316 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r77316 | georg.brandl | 2010-01-05 11:22:04 +0100 (Di, 05 Jan 2010) | 1 line
Assorted doc fixes by Florent.
........
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/binascii.rst | 8 | ||||
| -rw-r--r-- | Doc/library/reprlib.rst | 2 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index c42f81f..2f7851a 100644 --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -109,11 +109,11 @@ The :mod:`binascii` module defines the following functions: use as a checksum algorithm, it is not suitable for use as a general hash algorithm. Use as follows:: - print(binascii.crc32("hello world")) + print(binascii.crc32(b"hello world")) # Or, in two pieces: - crc = binascii.crc32("hello") - crc = binascii.crc32(" world", crc) & 0xffffffff - print('crc32 = 0x%08x' % crc) + crc = binascii.crc32(b"hello") + crc = binascii.crc32(b" world", crc) & 0xffffffff + print('crc32 = {:#010x}'.format(crc)) .. note:: To generate the same numeric value across all Python versions and diff --git a/Doc/library/reprlib.rst b/Doc/library/reprlib.rst index 17a6ac4..958ead6 100644 --- a/Doc/library/reprlib.rst +++ b/Doc/library/reprlib.rst @@ -130,5 +130,5 @@ for file objects could be added:: return repr(obj) aRepr = MyRepr() - print aRepr.repr(sys.stdin) # prints '<stdin>' + print(aRepr.repr(sys.stdin)) # prints '<stdin>' diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 2a43b3d..2bbc020 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1903,7 +1903,7 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: .. describe:: iter(d) Return an iterator over the keys of the dictionary. This is a shortcut - for :meth:`iterkeys`. + for ``iter(d.keys())``. .. method:: clear() |