mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 77316 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Georg Brandl 2010-07-04 17:33:33 +00:00
parent 1b84b5fd64
commit 31a0f86e36
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/glossary.rst
View file

@ -355,7 +355,7 @@ Glossary
list comprehension list comprehension
A compact way to process all or part of the elements in a sequence and A compact way to process all or part of the elements in a sequence and
return a list with the results. ``result = ["0x%02x" % x for x in return a list with the results. ``result = ['{:#04x}'.format(x) for x in
range(256) if x % 2 == 0]`` generates a list of strings containing range(256) if x % 2 == 0]`` generates a list of strings containing
even hex numbers (0x..) in the range from 0 to 255. The :keyword:`if` even hex numbers (0x..) in the range from 0 to 255. The :keyword:`if`
clause is optional. If omitted, all elements in ``range(256)`` are clause is optional. If omitted, all elements in ``range(256)`` are
@ -473,7 +473,7 @@ Glossary
object drops to zero, it is deallocated. Reference counting is object drops to zero, it is deallocated. Reference counting is
generally not visible to Python code, but it is a key element of the generally not visible to Python code, but it is a key element of the
:term:`CPython` implementation. The :mod:`sys` module defines a :term:`CPython` implementation. The :mod:`sys` module defines a
:func:`getrefcount` function that programmers can call to return the :func:`~sys.getrefcount` function that programmers can call to return the
reference count for a particular object. reference count for a particular object.
__slots__ __slots__

8
Doc/library/binascii.rst
View file

@ -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 use as a checksum algorithm, it is not suitable for use as a general hash
algorithm. Use as follows:: algorithm. Use as follows::
print(binascii.crc32("hello world")) print(binascii.crc32(b"hello world"))
# Or, in two pieces: # Or, in two pieces:
crc = binascii.crc32("hello") crc = binascii.crc32(b"hello")
crc = binascii.crc32(" world", crc) & 0xffffffff crc = binascii.crc32(b" world", crc) & 0xffffffff
print('crc32 = 0x%08x' % crc) print('crc32 = {:#010x}'.format(crc))
.. note:: .. note::
To generate the same numeric value across all Python versions and To generate the same numeric value across all Python versions and

2
Doc/library/reprlib.rst
View file

@ -130,5 +130,5 @@ for file objects could be added::
return repr(obj) return repr(obj)
aRepr = MyRepr() aRepr = MyRepr()
print aRepr.repr(sys.stdin) # prints '<stdin>' print(aRepr.repr(sys.stdin)) # prints '<stdin>'

2
Doc/library/stdtypes.rst
View file

@ -1903,7 +1903,7 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
.. describe:: iter(d) .. describe:: iter(d)
Return an iterator over the keys of the dictionary. This is a shortcut Return an iterator over the keys of the dictionary. This is a shortcut
for :meth:`iterkeys`. for ``iter(d.keys())``.
.. method:: clear() .. method:: clear()