summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-10-14 13:15:33 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-10-14 13:15:33 (GMT)
commit9a4acdf4a5a33e85e880de094ae7d5b0786634c8 (patch)
treeddfc18abc5ab049f763049efd7899e54053cec0d
parent3125f5039d71c03e6666394fd0adfa96d19a02b5 (diff)
downloadcpython-9a4acdf4a5a33e85e880de094ae7d5b0786634c8.zip
cpython-9a4acdf4a5a33e85e880de094ae7d5b0786634c8.tar.gz
cpython-9a4acdf4a5a33e85e880de094ae7d5b0786634c8.tar.bz2
Fix issue10065 - future_builtins' docstring lacks some functions
-rw-r--r--Modules/future_builtins.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/Modules/future_builtins.c b/Modules/future_builtins.c
index 3deece6..b2a3ed8 100644
--- a/Modules/future_builtins.c
+++ b/Modules/future_builtins.c
@@ -14,12 +14,20 @@ but that conflict with builtins that already exist in Python 2.x.\n\
\n\
Functions:\n\
\n\
-hex(arg) -- Returns the hexadecimal representation of an integer\n\
-oct(arg) -- Returns the octal representation of an integer\n\
+ascii(arg) -- Returns the canonical string representation of an object.\n\
+filter(pred, iterable) -- Returns an iterator yielding those items of \n\
+ iterable for which pred(item) is true.\n\
+hex(arg) -- Returns the hexadecimal representation of an integer.\n\
+map(func, *iterables) -- Returns an iterator that computes the function \n\
+ using arguments from each of the iterables.\n\
+oct(arg) -- Returns the octal representation of an integer.\n\
+zip(iter1 [,iter2 [...]]) -- Returns a zip object whose .next() method \n\
+ returns a tuple where the i-th element comes from the i-th iterable \n\
+ argument.\n\
\n\
The typical usage of this module is to replace existing builtins in a\n\
module's namespace:\n \n\
-from future_builtins import hex, oct\n");
+from future_builtins import ascii, filter, map, hex, oct, zip\n");
static PyObject *
builtin_hex(PyObject *self, PyObject *v)