summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2012-05-08 10:54:05 (GMT)
committerLarry Hastings <larry@hastings.org>2012-05-08 10:54:05 (GMT)
commitd3f424fe4546325d74d9511c7de14e452d1cfb05 (patch)
tree275944bb02aaf1cdebd715427141378804bc6d2c /Python
parent869b1f907034e2d0299b45362ed0dc30269269ee (diff)
parentd9e4a414d7bb634f1f946ff9052ece05d17109bb (diff)
downloadcpython-d3f424fe4546325d74d9511c7de14e452d1cfb05.zip
cpython-d3f424fe4546325d74d9511c7de14e452d1cfb05.tar.gz
cpython-d3f424fe4546325d74d9511c7de14e452d1cfb05.tar.bz2
Merge from 3.2. Issue #14749: Add support for 'Z' to skipitem().
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 78b2328..5ddf236 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1657,6 +1657,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
case 'z': /* string or None */
case 'y': /* bytes */
case 'u': /* unicode string */
+ case 'Z': /* unicode string or None */
case 'w': /* buffer, read-write */
{
(void) va_arg(*p_va, char **);