[Python-checkins] cpython (2.7): backport 7a05cb3beddf to 2.7

Mon May 7 21:58:46 CEST 2012

http://hg.python.org/cpython/rev/07b3fc67bf45
changeset: 76827:07b3fc67bf45
branch: 2.7
parent: 76807:9bb9bd9237c1
user: Sandro Tosi <sandro.tosi at gmail.com>
date: Mon May 07 21:56:24 2012 +0200
summary:
 backport 7a05cb3beddf to 2.7
files:
 Doc/library/functions.rst | 25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -18,16 +18,25 @@
 :func:`bool` :func:`filter` :func:`len` :func:`range` :func:`type`
 :func:`bytearray` :func:`float` :func:`list` :func:`raw_input` :func:`unichr`
 :func:`callable` :func:`format` :func:`locals` :func:`reduce` :func:`unicode`
-:func:`chr` :func:`frozenset` :func:`long` :func:`reload` :func:`vars`
-:func:`classmethod` :func:`getattr` :func:`map` :func:`.repr` :func:`xrange`
+:func:`chr` |func-frozenset|_ :func:`long` :func:`reload` :func:`vars`
+:func:`classmethod` :func:`getattr` :func:`map` :func:`repr` :func:`xrange`
 :func:`cmp` :func:`globals` :func:`max` :func:`reversed` :func:`zip`
-:func:`compile` :func:`hasattr` :func:`memoryview` :func:`round` :func:`__import__`
-:func:`complex` :func:`hash` :func:`min` :func:`set` :func:`apply`
+:func:`compile` :func:`hasattr` |func-memoryview|_ :func:`round` :func:`__import__`
+:func:`complex` :func:`hash` :func:`min` |func-set|_ :func:`apply`
 :func:`delattr` :func:`help` :func:`next` :func:`setattr` :func:`buffer`
-:func:`dict` :func:`hex` :func:`object` :func:`slice` :func:`coerce`
+|func-dict|_ :func:`hex` :func:`object` :func:`slice` :func:`coerce`
 :func:`dir` :func:`id` :func:`oct` :func:`sorted` :func:`intern`
 =================== ================= ================== ================= ====================
 
+.. using :func:`dict` would create a link to another page, so local targets are
+ used, with replacement texts to make the output in the table consistent
+
+.. |func-dict| replace:: ``dict()``
+.. |func-frozenset| replace:: ``frozenset()``
+.. |func-memoryview| replace:: ``memoryview()``
+.. |func-set| replace:: ``set()``
+
+
 .. function:: abs(x)
 
 Return the absolute value of a number. The argument may be a plain or long
@@ -265,6 +274,7 @@
 example, ``delattr(x, 'foobar')`` is equivalent to ``del x.foobar``.
 
 
+.. _func-dict:
 .. function:: dict([arg])
 :noindex:
 
@@ -513,6 +523,7 @@
 .. versionadded:: 2.6
 
 
+.. _func-frozenset:
 .. function:: frozenset([iterable])
 :noindex:
 
@@ -752,7 +763,7 @@
 .. versionchanged:: 2.5
 Added support for the optional *key* argument.
 
-
+.. _func-memoryview:
 .. function:: memoryview(obj)
 :noindex:
 
@@ -1181,6 +1192,8 @@
 can't be represented exactly as a float. See :ref:`tut-fp-issues` for
 more information.
 
+
+.. _func-set:
 .. function:: set([iterable])
 :noindex:
 
-- 
Repository URL: http://hg.python.org/cpython
