FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-109118: Disallow nested scopes within PEP 695 scopes within classes by JelleZijlstra · Pull Request #109196 · python/cpython · GitHub

/ cpython Public
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
93 changes: 93 additions & 0 deletions Lib/test/test_type_params.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,99 @@ def test_comprehension_02(self):
func, = T.__bound__
self.assertEqual(func(), 1)

def test_gen_exp_in_nested_class(self):
code = """
from test.test_type_params import make_base

class C[T]:
T = "class"
class Inner(make_base(T for _ in (1,)), make_base(T)):
pass
"""
C = run_code(code)["C"]
T, = C.__type_params__
base1, base2 = C.Inner.__bases__
self.assertEqual(list(base1.__arg__), [T])
self.assertEqual(base2.__arg__, "class")

def test_gen_exp_in_nested_generic_class(self):
code = """
from test.test_type_params import make_base

class C[T]:
T = "class"
class Inner[U](make_base(T for _ in (1,)), make_base(T)):
pass
"""
with self.assertRaisesRegex(SyntaxError,
"Cannot use comprehension in annotation scope within class scope"):
run_code(code)

def test_listcomp_in_nested_class(self):
code = """
from test.test_type_params import make_base

class C[T]:
T = "class"
class Inner(make_base([T for _ in (1,)]), make_base(T)):
pass
"""
C = run_code(code)["C"]
T, = C.__type_params__
base1, base2 = C.Inner.__bases__
self.assertEqual(base1.__arg__, [T])
self.assertEqual(base2.__arg__, "class")

def test_listcomp_in_nested_generic_class(self):
code = """
from test.test_type_params import make_base

class C[T]:
T = "class"
class Inner[U](make_base([T for _ in (1,)]), make_base(T)):
pass
"""
with self.assertRaisesRegex(SyntaxError,
"Cannot use comprehension in annotation scope within class scope"):
run_code(code)

def test_gen_exp_in_generic_method(self):
code = """
class C[T]:
T = "class"
def meth[U](x: (T for _ in (1,)), y: T):
pass
"""
with self.assertRaisesRegex(SyntaxError,
"Cannot use comprehension in annotation scope within class scope"):
run_code(code)

def test_nested_scope_in_generic_alias(self):
code = """
class C[T]:
T = "class"
{}
"""
error_cases = [
"type Alias1[T] = lambda: T",
"type Alias2 = lambda: T",
"type Alias3[T] = (T for _ in (1,))",
"type Alias4 = (T for _ in (1,))",
"type Alias5[T] = [T for _ in (1,)]",
"type Alias6 = [T for _ in (1,)]",
]
for case in error_cases:
with self.subTest(case=case):
with self.assertRaisesRegex(SyntaxError,
r"Cannot use [a-z]+ in annotation scope within class scope"):
run_code(code.format(case))


def make_base(arg):
class Base:
__arg__ = arg
return Base


def global_generic_func[T]():
pass
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Disallow nested scopes (lambdas, generator expressions, and comprehensions)
within PEP 695 annotation scopes that are nested within classes.
23 changes: 23 additions & 0 deletions Python/symtable.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -2011,6 +2011,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)
Expand Down Expand Up @@ -2460,6 +2471,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));
Expand Down

Back | FazBrowse Home | New Git URL