[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

benjamin.peterson python-checkins at python.org
Tue Jan 3 23:48:35 CET 2012


http://hg.python.org/cpython/rev/f24faf5a6af2
changeset:   74260:f24faf5a6af2
parent:      74258:fdcb6935f3f2
parent:      74259:7b01b88aae44
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Jan 03 16:48:14 2012 -0600
summary:
  merge 3.2

files:
  Python/bltinmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -496,7 +496,7 @@
     PyObject *format_spec = NULL;
 
     if (!PyArg_ParseTuple(args, "O|U:format", &value, &format_spec))
-    return NULL;
+        return NULL;
 
     return PyObject_Format(value, format_spec);
 }

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list