summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-24 21:54:47 +0000
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-24 21:54:47 +0000
commitbf8484e77dfd5f43316bd237a538f8407e28ab5b (patch)
tree0e5f73d486dd641b94f30bc9f21444553c4e27a8
parent39e32a7e8164961862362d15820575c26b4248fe (diff)
downloadcpython-git-bf8484e77dfd5f43316bd237a538f8407e28ab5b.tar.gz
Merged revisions 86732 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86732 | ezio.melotti | 2010-11-24 22:18:02 +0200 (Wed, 24 Nov 2010) | 1 line #10299: Add a table that lists all the built-in functions in functions.rst ........
-rw-r--r--Doc/library/functions.rst20
-rw-r--r--Misc/NEWS5
2 files changed, 25 insertions, 0 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 0b16327ea6..34e1dbe93f 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -7,6 +7,26 @@ Built-in Functions
The Python interpreter has a number of functions built into it that are always
available. They are listed here in alphabetical order.
+=================== ================= ================== ================= ====================
+.. .. Built-in Functions .. ..
+=================== ================= ================== ================= ====================
+:func:`abs` :func:`divmod` :func:`input` :func:`open` :func:`staticmethod`
+:func:`all` :func:`enumerate` :func:`int` :func:`ord` :func:`str`
+:func:`any` :func:`eval` :func:`isinstance` :func:`pow` :func:`sum`
+:func:`basestring` :func:`execfile` :func:`issubclass` :func:`print` :func:`super`
+:func:`bin` :func:`file` :func:`iter` :func:`property` :func:`tuple`
+: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:`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:`delattr` :func:`help` :func:`next` :func:`setattr` :func:`buffer`
+:func:`dict` :func:`hex` :func:`object` :func:`slice` :func:`coerce`
+:func:`dir` :func:`id` :func:`oct` :func:`sorted` :func:`intern`
+=================== ================= ================== ================= ====================
.. function:: abs(x)
diff --git a/Misc/NEWS b/Misc/NEWS
index 9edc91d925..1f16cf52ff 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,11 @@ Tests
- Issue #9424: Replace deprecated assert* methods in the Python test suite.
+Documentation
+-------------
+
+- Issue #10299: List the built-in functions in a table in functions.rst.
+
What's New in Python 2.7.1 release candidate 1?
===============================================