summaryrefslogtreecommitdiffstats
path: root/Python/getargs.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-12-22 20:51:15 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-12-22 20:51:15 (GMT)
commit4caef5c7e2f3b0de2725d83e8eab20f5dd3d6195 (patch)
tree68a77c855b6458c9a756b7c1fbc89c66dc4867e4 /Python/getargs.c
parent1c3978525678ea52e601e4d8571676385f767e0f (diff)
downloadcpython-4caef5c7e2f3b0de2725d83e8eab20f5dd3d6195.zip
cpython-4caef5c7e2f3b0de2725d83e8eab20f5dd3d6195.tar.gz
cpython-4caef5c7e2f3b0de2725d83e8eab20f5dd3d6195.tar.bz2
fix #4720: the format to PyArg_ParseTupleAndKeywords can now start with '|'
Diffstat (limited to 'Python/getargs.c')
-rw-r--r--Python/getargs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 9d1f0b2..544948b 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1601,7 +1601,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
}
}
- if (!IS_END_OF_FORMAT(*format)) {
+ if (!IS_END_OF_FORMAT(*format) && *format != '|') {
PyErr_Format(PyExc_RuntimeError,
"more argument specifiers than keyword list entries "
"(remaining format:'%s')", format);