Changeset 391 for python/trunk/Modules/future_builtins.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Modules/future_builtins.c (modified) (5 diffs)

python/trunk/Modules/future_builtins.c

@@ -15 +15 @@
 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)
 {
-        return PyNumber_ToBase(v, 16);
+    return PyNumber_ToBase(v, 16);
 }
 
@@ -37 +45 @@
 builtin_oct(PyObject *self, PyObject *v)
 {
-        return PyNumber_ToBase(v, 8);
+    return PyNumber_ToBase(v, 8);
 }
 
@@ -49 +57 @@
 builtin_ascii(PyObject *self, PyObject *v)
 {
-        return PyObject_Repr(v);
+    return PyObject_Repr(v);
 }
 
@@ -62 +70 @@
 
 static PyMethodDef module_functions[] = {
-        {"hex",         builtin_hex,        METH_O, hex_doc},
-        {"oct",         builtin_oct,        METH_O, oct_doc},
-        {"ascii",       builtin_ascii,      METH_O, ascii_doc},
-        {NULL,          NULL}   /* Sentinel */
+    {"hex",             builtin_hex,        METH_O, hex_doc},
+    {"oct",             builtin_oct,        METH_O, oct_doc},
+    {"ascii",           builtin_ascii,      METH_O, ascii_doc},
+    {NULL,              NULL}   /* Sentinel */
 };
 
@@ -74 +82 @@
 initfuture_builtins(void)
 {
-        PyObject *m, *itertools, *iter_func;
-        char *it_funcs[] = {"imap", "ifilter", "izip", NULL};
-        char **cur_func;
+    PyObject *m, *itertools, *iter_func;
+    char *it_funcs[] = {"imap", "ifilter", "izip", NULL};
+    char **cur_func;
 
-        m = Py_InitModule3("future_builtins", module_functions, module_doc);
-        if (m == NULL)
-                return;
+    m = Py_InitModule3("future_builtins", module_functions, module_doc);
+    if (m == NULL)
+        return;
 
-        itertools = PyImport_ImportModuleNoBlock("itertools");
-        if (itertools == NULL)
-                return;
+    itertools = PyImport_ImportModuleNoBlock("itertools");
+    if (itertools == NULL)
+        return;
 
-        for (cur_func = it_funcs; *cur_func; ++cur_func){
-                iter_func = PyObject_GetAttrString(itertools, *cur_func);
-                if (iter_func == NULL)
-                        return;
-                PyModule_AddObject(m, *cur_func+1, iter_func);
-        }
-        Py_DECREF(itertools);
-        /* any other initialization needed */
+    /* If anything in the following loop fails, we fall through. */
+    for (cur_func = it_funcs; *cur_func; ++cur_func){
+        iter_func = PyObject_GetAttrString(itertools, *cur_func);
+        if (iter_func == NULL ||
+            PyModule_AddObject(m, *cur_func+1, iter_func) < 0)
+            break;
+    }
+    Py_DECREF(itertools);
+    /* any other initialization needed */
 }