summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-12-03 11:01:53 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-12-03 11:01:53 (GMT)
commitd0ed0db574acef68cb24bb92a2b315474c86386b (patch)
treeb520b43792f3505704df91560018ca7f19f51a7e /Python
parenta9566d02a26a0e9a4b6ed76937c46da49a012bf1 (diff)
downloadcpython-d0ed0db574acef68cb24bb92a2b315474c86386b.zip
cpython-d0ed0db574acef68cb24bb92a2b315474c86386b.tar.gz
cpython-d0ed0db574acef68cb24bb92a2b315474c86386b.tar.bz2
Merged revisions 76646 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76646 | mark.dickinson | 2009-12-03 10:59:46 +0000 (Thu, 03 Dec 2009) | 6 lines Issue #7414: Add missing 'case 'C'' to skipitem() in getargs.c. This was causing PyArg_ParseTupleAndKeywords(args, kwargs, "|CC", ...) to fail with a RuntimeError. Thanks Case Van Horsen for tracking down the source of this error. ........
Diffstat (limited to 'Python')
-rw-r--r--Python/getargs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 486cf7d..7726324 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1776,6 +1776,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
case 'D': /* complex double */
#endif
case 'c': /* char */
+ case 'C': /* unicode char */
{
(void) va_arg(*p_va, void *);
break;