Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
diff --git a/Modules/future_builtins.c b/Modules/future_builtins.c
index 4c840fb..1aae2cc 100644
--- a/Modules/future_builtins.c
+++ b/Modules/future_builtins.c
@@ -24,7 +24,7 @@
static PyObject *
builtin_hex(PyObject *self, PyObject *v)
{
- return PyNumber_ToBase(v, 16);
+ return PyNumber_ToBase(v, 16);
}
PyDoc_STRVAR(hex_doc,
@@ -36,7 +36,7 @@
static PyObject *
builtin_oct(PyObject *self, PyObject *v)
{
- return PyNumber_ToBase(v, 8);
+ return PyNumber_ToBase(v, 8);
}
PyDoc_STRVAR(oct_doc,
@@ -48,7 +48,7 @@
static PyObject *
builtin_ascii(PyObject *self, PyObject *v)
{
- return PyObject_Repr(v);
+ return PyObject_Repr(v);
}
PyDoc_STRVAR(ascii_doc,
@@ -61,10 +61,10 @@
/* List of functions exported by this module */
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 */
};
@@ -73,24 +73,24 @@
PyMODINIT_FUNC
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 */
+ 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 */
}