summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-01-03 22:48:14 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-01-03 22:48:14 (GMT)
commit332503db07ab5f8c2dea301a7ec9b8f7d4f1152f (patch)
tree9f0b126abb5e0815db11cc28bbeaa73a973a095d
parent199808b796f0b8964796c7279d8e7f11f4b7480b (diff)
parenta12d5c62f78640c274e7babd5b20744af5008837 (diff)
downloadcpython-332503db07ab5f8c2dea301a7ec9b8f7d4f1152f.zip
cpython-332503db07ab5f8c2dea301a7ec9b8f7d4f1152f.tar.gz
cpython-332503db07ab5f8c2dea301a7ec9b8f7d4f1152f.tar.bz2
merge 3.2
-rw-r--r--Python/bltinmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 13349cc..022d432 100644
--- 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);
}