summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2012-05-08 03:54:05 -0700
committerLarry Hastings <larry@hastings.org>2012-05-08 03:54:05 -0700
commit42fe8e94e168bbb5a023531e98a1cebaa5ed90a4 (patch)
tree395e30b7912b52eb4cdc54719b26b66aa73f912a /Python
parente3dc636bcf7c7a8b225750985726e160f8f367eb (diff)
parent1354f33ab92f9e7bbcfff5003f68879676d3b03e (diff)
downloadcpython-42fe8e94e168bbb5a023531e98a1cebaa5ed90a4.tar.gz
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 78b232894c..5ddf236aa7 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 **);