mirror of
https://github.com/python/cpython
synced 2024-09-04 15:56:13 +00:00
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:
parent
0c2b6a3943
commit
d8a82e2897
|
@ -334,6 +334,7 @@ def check_both_ways(source):
|
|||
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("pass # type: ignorewhatever\n")
|
||||
check_both_ways("pass # type: ignoreé\n")
|
||||
|
||||
def test_func_type_input(self):
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Only accept text after `# type: ignore` if the first character is ASCII.
|
||||
This is to disallow things like `# type: ignoreé`.
|
|
@ -1275,10 +1275,11 @@ tok_get(struct tok_state *tok, char **p_start, char **p_end)
|
|||
type_start = p;
|
||||
|
||||
/* 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 = (
|
||||
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) {
|
||||
*p_start = (char *) ignore_end;
|
||||
|
|
Loading…
Reference in a new issue