Apr 28, 2024 · Apr 18, 2024 · Apr 18, 2024 · Apr 26, 2024 · Apr 26, 2024 · Apr 26, 2024
diff --git a/Python/compile.c b/Python/compile.c

 #define CAPSULE_NAME "compile.c compiler unit"

 static inline bool in_class_like_block(struct compiler *c) {
    return c->u->u_ste->ste_type == ClassBlock || c->u->u_ste->ste_can_see_class_scope;
 }

 static int
 compiler_setup(struct compiler *c, mod_ty mod, PyObject *filename,
                                 PySTEntryObject *entry,
                                 inlined_comprehension_state *state)
 {
    int in_class_block =(c->u->u_ste->ste_type == ClassBlock) && !c->u->u_in_inlined_comp;
    int in_class_block =in_class_like_block(c) && !c->u->u_in_inlined_comp;
    c->u->u_in_inlined_comp++;
    // iterate over names bound in the comprehension and ensure we isolate
    // them from the outer scope as needed
diff --git a/Python/symtable.c b/Python/symtable.c
                // free vars in comprehension that are locals in outer scope can
                // now simply be locals, unless they are free in comp children,
                // or if the outer scope is a class block
                if (!is_free_in_any_child(comp, k) && ste->ste_type != ClassBlock) {
                if (!is_free_in_any_child(comp, k) && ste->ste_type != ClassBlock
                        && !ste->ste_can_see_class_scope) {
                    if (PySet_Discard(comp_free, k) < 0) {
                        return 0;
                    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -371,6 +371,9 @@ static PyCodeObject optimize_and_assemble(struct compiler , int addNone);

		#define CAPSULE_NAME "compile.c compiler unit"

		static inline bool in_class_like_block(struct compiler *c) {
		return c->u->u_ste->ste_type == ClassBlock \|\| c->u->u_ste->ste_can_see_class_scope;
		}

		static int
		compiler_setup(struct compiler c, mod_ty mod, PyObject filename,
Expand DownExpand Up		@@ -5460,7 +5463,7 @@ push_inlined_comprehension_state(struct compiler *c, location loc,
		PySTEntryObject *entry,
		inlined_comprehension_state *state)
		{
		int in_class_block =(c->u->u_ste->ste_type == ClassBlock) && !c->u->u_in_inlined_comp;
		int in_class_block =in_class_like_block(c) && !c->u->u_in_inlined_comp;
		c->u->u_in_inlined_comp++;
		// iterate over names bound in the comprehension and ensure we isolate
		// them from the outer scope as needed
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -810,7 +810,8 @@ inline_comprehension(PySTEntryObject ste, PySTEntryObject comp,
		// free vars in comprehension that are locals in outer scope can
		// now simply be locals, unless they are free in comp children,
		// or if the outer scope is a class block
		if (!is_free_in_any_child(comp, k) && ste->ste_type != ClassBlock) {
		if (!is_free_in_any_child(comp, k) && ste->ste_type != ClassBlock
		&& !ste->ste_can_see_class_scope) {
		if (PySet_Discard(comp_free, k) < 0) {
		return 0;
		}
Expand Down