Commitdaadf7c

committed

[3.13]gh-133516: RaiseValueError when constantsTrue,False orNone are used as an identifier after NFKC normalization (GH-133523)

(cherry picked from commitd9b0b07)

1 parenta0dd4f0 commitdaadf7cCopy full SHA for daadf7c

File tree

+28

-0

lines changed

+28

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -960,6 +960,17 @@ def test_constant_as_name(self):`
`960`	`960`	`):`
`961`	`961`	`compile(expr,"<test>","eval")`
`962`	`962`
	`963`	`+deftest_constant_as_unicode_name(self):`
	`964`	`+constants= [`
	`965`	`+ ("True",b"Tru\xe1\xb5\x89"),`
	`966`	`+ ("False",b"Fal\xc5\xbfe"),`
	`967`	`+ ("None",b"N\xc2\xbane"),`
	`968`	`+ ]`
	`969`	`+forconstantinconstants:`
	`970`	`+withself.assertRaisesRegex(ValueError,`
	`971`	`+f"identifier field can't represent '{constant[0]}' constant"):`
	`972`	`+ast.parse(constant[1],mode="eval")`
	`973`	`+`
`963`	`974`	`deftest_precedence_enum(self):`
`964`	`975`	`class_Precedence(enum.IntEnum):`
`965`	`976`	`"""Precedence table that originated from python grammar."""`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Raise:exc:`ValueError` when constants ``True``, ``False`` or ``None`` are
	`2`	`+used as an identifier after NFKC normalization.`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -545,6 +545,21 @@ _PyPegen_new_identifier(Parser p, const char n)`
`545`	`545`	`}`
`546`	`546`	`id=id2;`
`547`	`547`	`}`
	`548`	`+staticconstchar*constforbidden[]= {`
	`549`	`+"None",`
	`550`	`+"True",`
	`551`	`+"False",`
	`552`	`+NULL`
	`553`	`+ };`
	`554`	`+for (inti=0;forbidden[i]!=NULL;i++) {`
	`555`	`+if (_PyUnicode_EqualToASCIIString(id,forbidden[i])) {`
	`556`	`+PyErr_Format(PyExc_ValueError,`
	`557`	`+"identifier field can't represent '%s' constant",`
	`558`	`+forbidden[i]);`
	`559`	`+Py_DECREF(id);`
	`560`	`+ gotoerror;`
	`561`	`+ }`
	`562`	`+ }`
`548`	`563`	`PyInterpreterState*interp=_PyInterpreterState_GET();`
`549`	`564`	`_PyUnicode_InternImmortal(interp,&id);`
`550`	`565`	`if (_PyArena_AddPyObject(p->arena,id)<0)`

Comments

(0)