summaryrefslogtreecommitdiff
path: root/Python/bltinmodule.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-01-03 16:48:14 -0600
committerBenjamin Peterson <benjamin@python.org>2012-01-03 16:48:14 -0600
commit40c6a9f4554fff8a8fa7e09805f093f9e8bdcf3a (patch)
treea44b44fc566b6f44f7e73d6aa474ab3d89e24ed6 /Python/bltinmodule.c
parent262020d4bf7f74559fe1a93a5842b26eababb255 (diff)
parent0f97cff6c6f527fcb4c4b7acad30cfb54b146934 (diff)
downloadcpython-40c6a9f4554fff8a8fa7e09805f093f9e8bdcf3a.tar.gz
merge 3.2
Diffstat (limited to 'Python/bltinmodule.c')
-rw-r--r--Python/bltinmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 13349cc7bb..022d432284 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);
}