Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge link additions/fixes with 3.3.

This commit is contained in:
Ezio Melotti 2012-10-12 11:02:39 +03:00
parent e312f4d304 a6229e6ebd
commit f79774bb92
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/howto/unicode.rst
View File

@ -414,7 +414,7 @@ References
---------- ----------
The ``str`` type is described in the Python library reference at The ``str`` type is described in the Python library reference at
:ref:`typesseq`. :ref:`textseq`.
The documentation for the :mod:`unicodedata` module. The documentation for the :mod:`unicodedata` module.

14
Doc/library/functions.rst
View File

@ -122,6 +122,8 @@ are always available. They are listed here in alphabetical order.
Without an argument, an array of size 0 is created. Without an argument, an array of size 0 is created.
See also :ref:`binaryseq` and :ref:`typebytearray`.
.. _func-bytes: .. _func-bytes:
.. function:: bytes([source[, encoding[, errors]]]) .. function:: bytes([source[, encoding[, errors]]])
@ -135,6 +137,8 @@ are always available. They are listed here in alphabetical order.
Bytes objects can also be created with literals, see :ref:`strings`. Bytes objects can also be created with literals, see :ref:`strings`.
See also :ref:`binaryseq`, :ref:`typebytes`, and :ref:`bytes-methods`.
.. function:: callable(object) .. function:: callable(object)
@ -687,6 +691,8 @@ are always available. They are listed here in alphabetical order.
method; if the value returned is equal to *sentinel*, :exc:`StopIteration` method; if the value returned is equal to *sentinel*, :exc:`StopIteration`
will be raised, otherwise the value will be returned. 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 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 a file until a certain line is reached. The following example reads a file
until the :meth:`readline` method returns an empty string:: until the :meth:`readline` method returns an empty string::
@ -707,7 +713,7 @@ are always available. They are listed here in alphabetical order.
:noindex: :noindex:
Rather than being a function, :class:`list` is actually a mutable Rather than being a function, :class:`list` is actually a mutable
sequence type, as documented in :ref:`typesseq`. sequence type, as documented in :ref:`typesseq-list` and :ref:`typesseq`.
.. function:: locals() .. function:: locals()
@ -1081,7 +1087,7 @@ are always available. They are listed here in alphabetical order.
:noindex: :noindex:
Rather than being a function, :class:`range` is actually an immutable Rather than being a function, :class:`range` is actually an immutable
sequence type, as documented in :ref:`typesseq`. sequence type, as documented in :ref:`typesseq-range` and :ref:`typesseq`.
.. function:: repr(object) .. function:: repr(object)
@ -1309,7 +1315,7 @@ are always available. They are listed here in alphabetical order.
:noindex: :noindex:
Rather than being a function, :class:`tuple` is actually an immutable Rather than being a function, :class:`tuple` is actually an immutable
sequence type, as documented in :ref:`typesseq`. sequence type, as documented in :ref:`typesseq-tuple` and :ref:`typesseq`.
.. function:: type(object) .. function:: type(object)
@ -1342,6 +1348,8 @@ are always available. They are listed here in alphabetical order.
... ...
>>> X = type('X', (object,), dict(a=1)) >>> X = type('X', (object,), dict(a=1))
See also :ref:`bltin-type-objects`.
.. function:: vars([object]) .. function:: vars([object])

2
Doc/library/string.rst
View File

@ -10,7 +10,7 @@
.. seealso:: .. seealso::
:ref:`typesseq` :ref:`textseq`
:ref:`string-methods` :ref:`string-methods`

2
Doc/tutorial/introduction.rst
View File

@ -390,7 +390,7 @@ The built-in function :func:`len` returns the length of a string::
.. seealso:: .. seealso::
:ref:`typesseq` :ref:`textseq`
Strings are examples of *sequence types*, and support the common Strings are examples of *sequence types*, and support the common
operations supported by such types. operations supported by such types.