mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

gh-104640: Disallow walrus in comprehension within type scopes (#104641)

Browse source
This commit is contained in:
Jelle Zijlstra 2023-05-19 07:31:09 -07:00 • committed by GitHub
parent ab8f54668b
commit 8a8853af24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_type_params.py
View file

@ -136,6 +136,9 @@ class TypeParamsInvalidTest(unittest.TestCase):
check_syntax_error(self, "class X[T: (y := 3)]: pass") check_syntax_error(self, "class X[T: (y := 3)]: pass")
check_syntax_error(self, "class X[T](y := Sequence[T]): pass") check_syntax_error(self, "class X[T](y := Sequence[T]): pass")
check_syntax_error(self, "def f[T](y: (x := Sequence[T])): pass") check_syntax_error(self, "def f[T](y: (x := Sequence[T])): pass")
check_syntax_error(self, "class X[T]([(x := 3) for _ in range(2)] and B): pass")
check_syntax_error(self, "def f[T: [(x := 3) for _ in range(2)]](): pass")
check_syntax_error(self, "type T = [(x := 3) for _ in range(2)]")
class TypeParamsNonlocalTest(unittest.TestCase): class TypeParamsNonlocalTest(unittest.TestCase):

35
Python/symtable.c
View file

@ -35,6 +35,15 @@
#define NAMED_EXPR_COMP_IN_CLASS \ #define NAMED_EXPR_COMP_IN_CLASS \
"assignment expression within a comprehension cannot be used in a class body" "assignment expression within a comprehension cannot be used in a class body"
#define NAMED_EXPR_COMP_IN_TYPEVAR_BOUND \
"assignment expression within a comprehension cannot be used in a TypeVar bound"
#define NAMED_EXPR_COMP_IN_TYPEALIAS \
"assignment expression within a comprehension cannot be used in a type alias"
#define NAMED_EXPR_COMP_IN_TYPEPARAM \
"assignment expression within a comprehension cannot be used within the definition of a generic"
#define NAMED_EXPR_COMP_CONFLICT \ #define NAMED_EXPR_COMP_CONFLICT \
"assignment expression cannot rebind comprehension iteration variable '%U'" "assignment expression cannot rebind comprehension iteration variable '%U'"
@ -1857,7 +1866,7 @@ symtable_extend_namedexpr_scope(struct symtable *st, expr_ty e)
} }
/* If we find a FunctionBlock entry, add as GLOBAL/LOCAL or NONLOCAL/LOCAL */ /* If we find a FunctionBlock entry, add as GLOBAL/LOCAL or NONLOCAL/LOCAL */
if (_PyST_IsFunctionLike(ste)) { if (ste->ste_type == FunctionBlock) {
long target_in_scope = _PyST_GetSymbol(ste, target_name); long target_in_scope = _PyST_GetSymbol(ste, target_name);
if (target_in_scope & DEF_GLOBAL) { if (target_in_scope & DEF_GLOBAL) {
if (!symtable_add_def(st, target_name, DEF_GLOBAL, LOCATION(e))) if (!symtable_add_def(st, target_name, DEF_GLOBAL, LOCATION(e)))
@ -1880,9 +1889,27 @@ symtable_extend_namedexpr_scope(struct symtable *st, expr_ty e)
return symtable_add_def_helper(st, target_name, DEF_GLOBAL, ste, LOCATION(e)); return symtable_add_def_helper(st, target_name, DEF_GLOBAL, ste, LOCATION(e));
} }
/* Disallow usage in ClassBlock */ /* Disallow usage in ClassBlock and type scopes */
if (ste->ste_type == ClassBlock) { if (ste->ste_type == ClassBlock ||
PyErr_Format(PyExc_SyntaxError, NAMED_EXPR_COMP_IN_CLASS); ste->ste_type == TypeParamBlock ||
ste->ste_type == TypeAliasBlock ||
ste->ste_type == TypeVarBoundBlock) {
switch (ste->ste_type) {
case ClassBlock:
PyErr_Format(PyExc_SyntaxError, NAMED_EXPR_COMP_IN_CLASS);
break;
case TypeParamBlock:
PyErr_Format(PyExc_SyntaxError, NAMED_EXPR_COMP_IN_TYPEPARAM);
break;
case TypeAliasBlock:
PyErr_Format(PyExc_SyntaxError, NAMED_EXPR_COMP_IN_TYPEALIAS);
break;
case TypeVarBoundBlock:
PyErr_Format(PyExc_SyntaxError, NAMED_EXPR_COMP_IN_TYPEVAR_BOUND);
break;
default:
Py_UNREACHABLE();
}
PyErr_RangedSyntaxLocationObject(st->st_filename, PyErr_RangedSyntaxLocationObject(st->st_filename,
e->lineno, e->lineno,
e->col_offset + 1, e->col_offset + 1,