summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-24 22:02:18 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-24 22:02:18 (GMT)
commit17f9b3d289ec2ba64338a0d2322e7be10eb65096 (patch)
tree3e82750c27087d3c255be4b0f451e06de7b6caa6
parent807bd0a8a47191f7aa25cd9d5619bbc46a3f2a2a (diff)
downloadcpython-17f9b3d289ec2ba64338a0d2322e7be10eb65096.zip
cpython-17f9b3d289ec2ba64338a0d2322e7be10eb65096.tar.gz
cpython-17f9b3d289ec2ba64338a0d2322e7be10eb65096.tar.bz2
Add NEWS entry for r86732 and fix double function in the table.
-rw-r--r--Doc/library/functions.rst8
-rw-r--r--Misc/NEWS5
2 files changed, 9 insertions, 4 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index e9e5412..1c3ee12 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`
=================== ================= ================== ================ ====================
diff --git a/Misc/NEWS b/Misc/NEWS
index 6891d1e..bd1e731 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,11 @@ Build
- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and
PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals.
+Documentation
+-------------
+
+- Issue #10299: List the built-in functions in a table in functions.rst.
+
What's New in Python 3.2 Alpha 4?
=================================