add tests for comprehensions in class scope

carljm · carljm · commit b6a025ba8326 · 2023-03-08T12:00:11.000-08:00
diff --git a/Lib/test/test_listcomps.py b/Lib/test/test_listcomps.py
@@ -115,7 +115,7 @@
     >>> [x() for x in items]
     [2, 2, 2, 2, 2]
 
-We also repeat each of the above scoping tests inside a function
+We also repeat each of the above scoping tests inside a function:
 
     >>> def test_func():
     ...     items = [(lambda i=i: i) for i in range(5)]
@@ -143,7 +143,37 @@
     >>> test_func()
     [2, 2, 2, 2, 2]
 
-Some more tests for scoping edge cases:
+And in class scope:
+
+    >>> class C:
+    ...     items = [(lambda i=i: i) for i in range(5)]
+    ...     ret = [x() for x in items]
+    >>> C.ret
+    [0, 1, 2, 3, 4]
+
+    >>> class C:
+    ...     items = [(lambda: i) for i in range(5)]
+    ...     ret = [x() for x in items]
+    >>> C.ret
+    [4, 4, 4, 4, 4]
+
+    >>> class C:
+    ...     items = [(lambda: i) for i in range(5)]
+    ...     i = 20
+    ...     ret = [x() for x in items]
+    >>> C.ret
+    [4, 4, 4, 4, 4]
+    >>> C.i
+    20
+
+    >>> class C:
+    ...     items = [(lambda: y) for i in range(5)]
+    ...     y = 2
+    ...     ret = [x() for x in items]
+    >>> C.ret
+    [2, 2, 2, 2, 2]
+
+Some more tests for scoping edge cases, each in func/module/class scope:
 
     >>> def test_func():
     ...     y = 10
diff --git a/Python/compile.c b/Python/compile.c
@@ -2670,7 +2670,6 @@ compiler_class(struct compiler *c, stmt_ty s)
         }
         else {
             /* No methods referenced __class__, so just return None */
-            assert(PyDict_GET_SIZE(c->u->u_cellvars) == 0);
             ADDOP_LOAD_CONST(c, NO_LOCATION, Py_None);
         }
         ADDOP_IN_SCOPE(c, NO_LOCATION, RETURN_VALUE);
@@ -5318,10 +5317,8 @@ push_inlined_comprehension_state(struct compiler *c, location loc,
         // need handling here since they shouldn't be isolated
         if (symbol & DEF_LOCAL && ~symbol & DEF_NONLOCAL) {
             if (c->u->u_fastlocals) {
-                // non-function scope: override this name to use fast locals,
-                // and that's all we need
+                // non-function scope: override this name to use fast locals
                 PySet_Add(c->u->u_fastlocals, k);
-                continue;
             }
             long scope = (symbol >> SCOPE_OFFSET) & SCOPE_MASK;
             PyObject *outv = PyDict_GetItemWithError(c->u->u_ste->ste_symbols, k);

Original file line number	Diff line number	Diff line change
`@@ -2670,7 +2670,6 @@ compiler_class(struct compiler *c, stmt_ty s)`
`2670`	`2670`	`}`
`2671`	`2671`	`else {`
`2672`	`2672`	`/* No methods referenced __class__, so just return None */`
`2673`		`- assert(PyDict_GET_SIZE(c->u->u_cellvars) == 0);`
`2674`	`2673`	`ADDOP_LOAD_CONST(c, NO_LOCATION, Py_None);`
`2675`	`2674`	`}`
`2676`	`2675`	`ADDOP_IN_SCOPE(c, NO_LOCATION, RETURN_VALUE);`
`@@ -5318,10 +5317,8 @@ push_inlined_comprehension_state(struct compiler *c, location loc,`
`5318`	`5317`	`// need handling here since they shouldn't be isolated`
`5319`	`5318`	`if (symbol & DEF_LOCAL && ~symbol & DEF_NONLOCAL) {`
`5320`	`5319`	`if (c->u->u_fastlocals) {`
`5321`		`- // non-function scope: override this name to use fast locals,`
`5322`		`- // and that's all we need`
	`5320`	`+ // non-function scope: override this name to use fast locals`
`5323`	`5321`	`PySet_Add(c->u->u_fastlocals, k);`
`5324`		`- continue;`
`5325`	`5322`	`}`
`5326`	`5323`	`long scope = (symbol >> SCOPE_OFFSET) & SCOPE_MASK;`
`5327`	`5324`	`PyObject *outv = PyDict_GetItemWithError(c->u->u_ste->ste_symbols, k);`