diff --git a/Lib/test/test_listcomps.py b/Lib/test/test_listcomps.py
index 1cc202bb599ae6..b2a3b7ea3e49b6 100644
--- a/Lib/test/test_listcomps.py
+++ b/Lib/test/test_listcomps.py
@@ -117,15 +117,15 @@ def get_output(moddict, name):
newcode = code
def get_output(moddict, name):
return moddict[name]
- ns = ns or {}
+ newns = ns.copy() if ns else {}
try:
- exec(newcode, ns)
+ exec(newcode, newns)
except raises as e:
# We care about e.g. NameError vs UnboundLocalError
self.assertIs(type(e), raises)
else:
for k, v in (outputs or {}).items():
- self.assertEqual(get_output(ns, k), v)
+ self.assertEqual(get_output(newns, k), v)
def test_lambdas_with_iteration_var_as_default(self):
code = """
@@ -180,6 +180,26 @@ def test_closure_can_jump_over_comp_scope(self):
z = [x() for x in items]
"""
outputs = {"z": [2, 2, 2, 2, 2]}
+ self._check_in_scopes(code, outputs, scopes=["module", "function"])
+
+ def test_cell_inner_free_outer(self):
+ code = """
+ def f():
+ return [lambda: x for x in (x, [1])[1]]
+ x = ...
+ y = [fn() for fn in f()]
+ """
+ outputs = {"y": [1]}
+ self._check_in_scopes(code, outputs, scopes=["module", "function"])
+
+ def test_free_inner_cell_outer(self):
+ code = """
+ g = 2
+ def f():
+ return g
+ y = [g for x in [1]]
+ """
+ outputs = {"y": [2]}
self._check_in_scopes(code, outputs)
def test_inner_cell_shadows_outer_redefined(self):
@@ -203,6 +223,37 @@ def inner():
outputs = {"x": -1}
self._check_in_scopes(code, outputs, ns={"g": -1})
+ def test_explicit_global(self):
+ code = """
+ global g
+ x = g
+ g = 2
+ items = [g for g in [1]]
+ y = g
+ """
+ outputs = {"x": 1, "y": 2, "items": [1]}
+ self._check_in_scopes(code, outputs, ns={"g": 1})
+
+ def test_explicit_global_2(self):
+ code = """
+ global g
+ x = g
+ g = 2
+ items = [g for x in [1]]
+ y = g
+ """
+ outputs = {"x": 1, "y": 2, "items": [2]}
+ self._check_in_scopes(code, outputs, ns={"g": 1})
+
+ def test_explicit_global_3(self):
+ code = """
+ global g
+ fns = [lambda: g for g in [2]]
+ items = [fn() for fn in fns]
+ """
+ outputs = {"items": [2]}
+ self._check_in_scopes(code, outputs, ns={"g": 1})
+
def test_assignment_expression(self):
code = """
x = -1
@@ -250,7 +301,7 @@ def g():
g()
"""
outputs = {"x": 1}
- self._check_in_scopes(code, outputs)
+ self._check_in_scopes(code, outputs, scopes=["module", "function"])
def test_introspecting_frame_locals(self):
code = """
diff --git a/Python/compile.c b/Python/compile.c
index 941c6e9d4fdbb7..f8d0197e9f0682 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -5028,14 +5028,19 @@ push_inlined_comprehension_state(struct compiler *c, location loc,
long scope = (symbol >> SCOPE_OFFSET) & SCOPE_MASK;
PyObject *outv = PyDict_GetItemWithError(c->u->u_ste->ste_symbols, k);
if (outv == NULL) {
+ assert(PyErr_Occurred());
return ERROR;
}
assert(PyLong_Check(outv));
long outsc = (PyLong_AS_LONG(outv) >> SCOPE_OFFSET) & SCOPE_MASK;
- if (scope != outsc) {
+ if (scope != outsc && !(scope == CELL && outsc == FREE)) {
// If a name has different scope inside than outside the
// comprehension, we need to temporarily handle it with the
- // right scope while compiling the comprehension.
+ // right scope while compiling the comprehension. (If it's free
+ // in outer scope and cell in inner scope, we can't treat it as
+ // both cell and free in the same function, but treating it as
+ // free throughout is fine; it's *_DEREF either way.)
+
if (state->temp_symbols == NULL) {
state->temp_symbols = PyDict_New();
if (state->temp_symbols == NULL) {
@@ -5071,7 +5076,11 @@ push_inlined_comprehension_state(struct compiler *c, location loc,
// comprehension and restore the original one after
ADDOP_NAME(c, loc, LOAD_FAST_AND_CLEAR, k, varnames);
if (scope == CELL) {
- ADDOP_NAME(c, loc, MAKE_CELL, k, cellvars);
+ if (outsc == FREE) {
+ ADDOP_NAME(c, loc, MAKE_CELL, k, freevars);
+ } else {
+ ADDOP_NAME(c, loc, MAKE_CELL, k, cellvars);
+ }
}
if (PyList_Append(state->pushed_locals, k) < 0) {
return ERROR;
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy