merge 3.2

2012-01-03 16:48:14 -06:00 · 2012-01-03 16:48:14 -06:00 · 332503db07
parent 199808b796 a12d5c62f7
commit 332503db07
1 changed files with 1 additions and 1 deletions
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@ -496,7 +496,7 @@ builtin_format(PyObject *self, PyObject *args)
    PyObject *format_spec = NULL;

    if (!PyArg_ParseTuple(args, "O|U:format", &value, &format_spec))
-    return NULL;
+        return NULL;

    return PyObject_Format(value, format_spec);
 }