summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-24 22:04:22 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-24 22:04:22 (GMT)
commit3188b2082e590d38eca60df7c67cc6212ad90f55 (patch)
tree6941ec13d8639decc5a620ceeabcff9d9d16e517 /Doc/library/functions.rst
parent42cc06ebf4cbb9ac75806c0d0203f3664853bc61 (diff)
downloadcpython-3188b2082e590d38eca60df7c67cc6212ad90f55.zip
cpython-3188b2082e590d38eca60df7c67cc6212ad90f55.tar.gz
cpython-3188b2082e590d38eca60df7c67cc6212ad90f55.tar.bz2
Merged revisions 86737 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86737 | ezio.melotti | 2010-11-25 00:02:18 +0200 (Thu, 25 Nov 2010) | 1 line Add NEWS entry for r86732 and fix double function in the table. ........
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 198dfa6..4a19de0 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -18,10 +18,10 @@ are always available. They are listed here in alphabetical order.
:func:`bool` :func:`filter` :func:`issubclass` :func:`pow` :func:`super`
:func:`bytearray` :func:`float` :func:`iter` :func:`print` :func:`tuple`
:func:`bytes` :func:`format` :func:`len` :func:`property` :func:`type`
-:func:`chr` :func:`frozenset` :func:`list` :func:`range` :func:`type`
-:func:`classmethod` :func:`getattr` :func:`locals` :func:`repr` :func:`vars`
-:func:`compile` :func:`globals` :func:`map` :func:`reversed` :func:`zip`
-:func:`complex` :func:`hasattr` :func:`max` :func:`round` :func:`__import__`
+:func:`chr` :func:`frozenset` :func:`list` :func:`range` :func:`vars`
+:func:`classmethod` :func:`getattr` :func:`locals` :func:`repr` :func:`zip`
+:func:`compile` :func:`globals` :func:`map` :func:`reversed` :func:`__import__`
+:func:`complex` :func:`hasattr` :func:`max` :func:`round`
:func:`delattr` :func:`hash` :func:`memoryview` :func:`set`
:func:`dict` :func:`help` :func:`min` :func:`setattr`
=================== ================= ================== ================ ====================