traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36878: Only allow text after `# type: ignore` if first character ASCII (GH-13504) 

This disallows things like `# type: ignoreé`, which seems wrong.

Also switch to using Py_ISALNUM for the alnum check, for consistency
with other code (and maybe correctness re: locale issues?).


https://bugs.python.org/issue36878
This commit is contained in:
Michael J. Sullivan 2019-05-22 13:43:37 -07:00 committed by Miss Islington (bot)
parent 0c2b6a3943
commit d8a82e2897
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_type_comments.py
View File

@ -334,6 +334,7 @@ class TypeCommentTests(unittest.TestCase):
check_both_ways("try: # type: int\n pass\nfinally:\n pass\n") check_both_ways("try: # type: int\n pass\nfinally:\n pass\n")
check_both_ways("try:\n pass\nfinally: # type: int\n pass\n") check_both_ways("try:\n pass\nfinally: # type: int\n pass\n")
check_both_ways("pass # type: ignorewhatever\n") check_both_ways("pass # type: ignorewhatever\n")
check_both_ways("pass # type: ignoreé\n")
def test_func_type_input(self): def test_func_type_input(self):

2
Misc/NEWS.d/next/Core and Builtins/2019-05-22-11-16-16.bpo-36878.QwLa3P.rst Normal file
View File

@ -0,0 +1,2 @@
Only accept text after `# type: ignore` if the first character is ASCII.
This is to disallow things like `# type: ignoreé`.

5
Parser/tokenizer.c
View File

@ -1275,10 +1275,11 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
type_start = p; type_start = p;
/* A TYPE_IGNORE is "type: ignore" followed by the end of the token /* A TYPE_IGNORE is "type: ignore" followed by the end of the token
* or anything non-alphanumeric. */ * or anything ASCII and non-alphanumeric. */
is_type_ignore = ( is_type_ignore = (
tok->cur >= ignore_end && memcmp(p, "ignore", 6) == 0 tok->cur >= ignore_end && memcmp(p, "ignore", 6) == 0
&& !(tok->cur > ignore_end && isalnum(p[6]))); && !(tok->cur > ignore_end
&& ((unsigned char)ignore_end[0] >= 128 || Py_ISALNUM(ignore_end[0]))));
if (is_type_ignore) { if (is_type_ignore) {
*p_start = (char *) ignore_end; *p_start = (char *) ignore_end;