diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-09-12 14:31:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-12 14:31:26 (GMT) |
| commit | 8208657f3d6398817f7dd6e5160ea037840e562f (patch) | |
| tree | e9c8c4fcf68ad8d1a093f012ca18bfdcb9d3c1b6 /Python/symtable.c | |
| parent | 778d094126f8975a9823ed7da1a630e29bb75bf0 (diff) | |
| download | cpython-8208657f3d6398817f7dd6e5160ea037840e562f.zip cpython-8208657f3d6398817f7dd6e5160ea037840e562f.tar.gz cpython-8208657f3d6398817f7dd6e5160ea037840e562f.tar.bz2 | |
[3.12] gh-109118: Disallow nested scopes within PEP 695 scopes within classes (GH-109196) (#109297)
gh-109118: Disallow nested scopes within PEP 695 scopes within classes (GH-109196)
Fixes GH-109118. Fixes GH-109194.
(cherry picked from commit b88d9e75f68f102aca45fa62e2b0e2e2ff46d810)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Carl Meyer <carl@oddbird.net>
Diffstat (limited to 'Python/symtable.c')
| -rw-r--r-- | Python/symtable.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Python/symtable.c b/Python/symtable.c index 115882d..691698e 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -1969,6 +1969,17 @@ symtable_visit_expr(struct symtable *st, expr_ty e) VISIT(st, expr, e->v.UnaryOp.operand); break; case Lambda_kind: { + if (st->st_cur->ste_can_see_class_scope) { + // gh-109118 + PyErr_Format(PyExc_SyntaxError, + "Cannot use lambda in annotation scope within class scope"); + PyErr_RangedSyntaxLocationObject(st->st_filename, + e->lineno, + e->col_offset + 1, + e->end_lineno, + e->end_col_offset + 1); + VISIT_QUIT(st, 0); + } if (e->v.Lambda.args->defaults) VISIT_SEQ(st, expr, e->v.Lambda.args->defaults); if (e->v.Lambda.args->kw_defaults) @@ -2418,6 +2429,18 @@ symtable_handle_comprehension(struct symtable *st, expr_ty e, identifier scope_name, asdl_comprehension_seq *generators, expr_ty elt, expr_ty value) { + if (st->st_cur->ste_can_see_class_scope) { + // gh-109118 + PyErr_Format(PyExc_SyntaxError, + "Cannot use comprehension in annotation scope within class scope"); + PyErr_RangedSyntaxLocationObject(st->st_filename, + e->lineno, + e->col_offset + 1, + e->end_lineno, + e->end_col_offset + 1); + VISIT_QUIT(st, 0); + } + int is_generator = (e->kind == GeneratorExp_kind); comprehension_ty outermost = ((comprehension_ty) asdl_seq_GET(generators, 0)); |