traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.3

This commit is contained in:
Benjamin Peterson 2012-10-12 12:05:09 -04:00
parent 78ef0885b4 b548d49f65
commit 4604980854
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/howto/functional.rst
View File

@ -292,14 +292,13 @@ ordering of the objects in the dictionary.
Applying :func:`iter` to a dictionary always loops over the keys, but
dictionaries have methods that return other iterators. If you want to iterate
over values or key/value pairs, you can explicitly call the
:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate
iterator.
:meth:`~dict.values` or :meth:`~dict.items` methods to get an appropriate iterator.
The :func:`dict` constructor can accept an iterator that returns a finite stream
of ``(key, value)`` tuples:
>>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')]
>>> dict(iter(L)) #doctest: +SKIP
>>> dict(iter(L))
{'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'}
Files also support iteration by calling the :meth:`~io.TextIOBase.readline`

25
Doc/library/functions.rst
View File

@ -122,8 +122,6 @@ are always available. They are listed here in alphabetical order.
Without an argument, an array of size 0 is created.
See also :ref:`binaryseq` and :ref:`typebytearray`.
.. _func-bytes:
.. function:: bytes([source[, encoding[, errors]]])
@ -137,8 +135,6 @@ are always available. They are listed here in alphabetical order.
Bytes objects can also be created with literals, see :ref:`strings`.
See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`.
.. function:: callable(object)
@ -692,8 +688,6 @@ are always available. They are listed here in alphabetical order.
*sentinel*, :exc:`StopIteration` will be raised, otherwise the value will
be returned.
See also :ref:`typeiter`.
One useful application of the second form of :func:`iter` is to read lines of
a file until a certain line is reached. The following example reads a file
until the :meth:`readline` method returns an empty string::
@ -714,7 +708,7 @@ are always available. They are listed here in alphabetical order.
:noindex:
Rather than being a function, :class:`list` is actually a mutable
sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`.
sequence type, as documented in :ref:`typesseq`.
.. function:: locals()
@ -1088,7 +1082,7 @@ are always available. They are listed here in alphabetical order.
:noindex:
Rather than being a function, :class:`range` is actually an immutable
sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`.
sequence type, as documented in :ref:`typesseq`.
.. function:: repr(object)
@ -1213,8 +1207,7 @@ are always available. They are listed here in alphabetical order.
.. function:: str(object='')
str(object[, encoding[, errors]])
Return a :ref:`string <textseq>` version of an object, using one of the
following modes:
Return a string version of an object, using one of the following modes:
If *encoding* and/or *errors* are given, :func:`str` will decode the
*object* which can either be a byte string or a character buffer using
@ -1237,9 +1230,11 @@ are always available. They are listed here in alphabetical order.
Objects can specify what ``str(object)`` returns by defining a :meth:`__str__`
special method.
For more information on strings and string methods, see the :ref:`textseq`
section. To output formatted strings, see the :ref:`string-formatting`
section. In addition, see the :ref:`stringservices` section.
For more information on strings see :ref:`typesseq` which describes sequence
functionality (strings are sequences), and also the string-specific methods
described in the :ref:`string-methods` section. To output formatted strings,
see the :ref:`string-formatting` section. In addition see the
:ref:`stringservices` section.
.. function:: sum(iterable[, start])
@ -1316,7 +1311,7 @@ are always available. They are listed here in alphabetical order.
:noindex:
Rather than being a function, :class:`tuple` is actually an immutable
sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`.
sequence type, as documented in :ref:`typesseq`.
.. function:: type(object)
@ -1349,8 +1344,6 @@ are always available. They are listed here in alphabetical order.
...
>>> X = type('X', (object,), dict(a=1))
See also :ref:`bltin-type-objects`.
.. function:: vars([object])