merge 3.2

332503db · Benjamin Peterson · 199808b7 · a12d5c62 · 332503db
Commit 332503db authored Jan 03, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Python/bltinmodule.c Python/bltinmodule.c +1 -1

No files found.
--- 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);
 }