Merge from 3.2. Issue #14749: Add support for 'Z' to skipitem().

larryhastings · larryhastings · commit d3f424fe4546 · 2012-05-08T03:54:05.000-07:00
diff --git 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 **);

Original file line number	Diff line number	Diff line change
`@@ -1657,6 +1657,7 @@ skipitem(const char *p_format, va_list p_va, int flags)`
`1657`	`1657`	`case 'z': /* string or None */`
`1658`	`1658`	`case 'y': /* bytes */`
`1659`	`1659`	`case 'u': /* unicode string */`
	`1660`	`+ case 'Z': /* unicode string or None */`
`1660`	`1661`	`case 'w': /* buffer, read-write */`
`1661`	`1662`	`{`
`1662`	`1663`	`(void) va_arg(p_va, char *);`