[Python-Dev] [Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (original) (raw)

Chris Jerdonek chris.jerdonek at gmail.com
Sat Oct 13 02:47:35 CEST 2012

On Fri, Oct 12, 2012 at 9:05 AM, benjamin.peterson <python-checkins at python.org> wrote:

http://hg.python.org/cpython/rev/6e721c72683f changeset: 79703:6e721c72683f parent: 79700:d3d4737fa093 parent: 79702:de8787029fe4 user: Benjamin Peterson <benjamin at python.org> date: Fri Oct 12 12:05:09 2012 -0400 summary: merge 3.3

It looks like this check-in reverted previous valid work.

--Chris

files: Doc/howto/functional.rst | 5 ++--- Doc/library/functions.rst | 25 +++++++++---------------- 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -292,14 +292,13 @@ 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 diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -122,8 +122,6 @@ 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 @@ 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 @@ 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 @@ :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 @@ :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 @@ .. 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 @@ 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 @@ :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 @@ ... >>> X = type('X', (object,), dict(a=1)) - See also :ref:bltin-type-objects. - .. function:: vars([object]) -- Repository URL: http://hg.python.org/cpython

Python-checkins mailing list Python-checkins at python.org http://mail.python.org/mailman/listinfo/python-checkins

More information about the Python-Dev mailing list