summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2018-07-11 19:49:17 +0300
committerGitHub <noreply@github.com>2018-07-11 19:49:17 +0300
commitef19fd200d0768919f1658466f8b6080b191fba0 (patch)
treecb396ceee187b10b4e55a7468a834a798611fcca /Python
parent6f036bb67d5a20c86c29ea5aeace563e3751baab (diff)
downloadcpython-git-ef19fd200d0768919f1658466f8b6080b191fba0.tar.gz
[2.7] bpo-23927: Make getargs.c skipitem() skipping 'w*'. (GH-8192). (GH-8255)
(cherry picked from commit 504373c59b48f1ea12132d515459022730db6047) Also backport tests for skipitem() and handling errors.
Diffstat (limited to 'Python')
-rw-r--r--Python/getargs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 32ff6fc069..cc1ddde977 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1780,7 +1780,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
else
(void) va_arg(*p_va, int *);
format++;
- } else if ((c == 's' || c == 'z') && *format == '*') {
+ } else if ((c == 's' || c == 'z' || c == 'w') && *format == '*') {
format++;
}
break;