diff options
| author | Michael J. Sullivan <sully@msully.net> | 2019-05-11 18:17:24 (GMT) |
|---|---|---|
| committer | Ivan Levkivskyi <levkivskyi@gmail.com> | 2019-05-11 18:17:24 (GMT) |
| commit | d8320ecb86da8df7c13d8bf8582507f736aa2924 (patch) | |
| tree | 87fc131f7bfdda0688b1d93ab9bce801c5f8a944 /Parser | |
| parent | 6236c9823ef3e8e2229b0598d3d8189adf5e00f2 (diff) | |
| download | cpython-d8320ecb86da8df7c13d8bf8582507f736aa2924.zip cpython-d8320ecb86da8df7c13d8bf8582507f736aa2924.tar.gz cpython-d8320ecb86da8df7c13d8bf8582507f736aa2924.tar.bz2 | |
bpo-36878: Allow extra text after `# type: ignore` comments (GH-13238)
In the parser, when using the type_comments=True option, recognize
a TYPE_IGNORE as anything containing `# type: ignore` followed by
a non-alphanumeric character. This is to allow ignores such as
`# type: ignore[E1000]`.
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/tokenizer.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index e8068f2..5dc2ae6 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -1272,14 +1272,11 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end) type_start = p; - is_type_ignore = tok->cur >= p + 6 && memcmp(p, "ignore", 6) == 0; - p += 6; - while (is_type_ignore && p < tok->cur) { - if (*p == '#') - break; - is_type_ignore = is_type_ignore && (*p == ' ' || *p == '\t'); - p++; - } + /* A TYPE_IGNORE is "type: ignore" followed by the end of the token + * or anything non-alphanumeric. */ + is_type_ignore = ( + tok->cur >= p + 6 && memcmp(p, "ignore", 6) == 0 + && !(tok->cur > p + 6 && isalnum(p[6]))); if (is_type_ignore) { /* If this type ignore is the only thing on the line, consume the newline also. */ |