summaryrefslogtreecommitdiff
path: root/Python/symtable.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-07-20 22:39:34 +0000
committerBenjamin Peterson <benjamin@python.org>2010-07-20 22:39:34 +0000
commitb1dabe110111af235ea2829b44e9e9f44aed91ef (patch)
treed94f88d082b8bae81a31268d07bf6f39cee2e2f7 /Python/symtable.c
parenta1047ef59eacea8f3b31386bb6c4a766d6237fd7 (diff)
downloadcpython-b1dabe110111af235ea2829b44e9e9f44aed91ef.tar.gz
revert unintended changes
Diffstat (limited to 'Python/symtable.c')
-rw-r--r--Python/symtable.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/Python/symtable.c b/Python/symtable.c
index 37bdf2a105..55c9f472fc 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -432,14 +432,7 @@ analyze_name(PySTEntryObject *ste, PyObject *scopes, PyObject *name, long flags,
return PySet_Add(free, name) >= 0;
}
if (flags & DEF_BOUND) {
- if (ste->ste_type == ClassBlock &&
- !(flags & DEF_PARAM) &&
- bound && PySet_Contains(bound, name)) {
- SET_SCOPE(scopes, name, LOCAL_ONLY);
- }
- else {
- SET_SCOPE(scopes, name, LOCAL);
- }
+ SET_SCOPE(scopes, name, LOCAL);
if (PySet_Add(local, name) < 0)
return 0;
if (PySet_Discard(global, name) < 0)
@@ -496,7 +489,7 @@ analyze_cells(PyObject *scopes, PyObject *free, const char *restricted)
long scope;
assert(PyLong_Check(v));
scope = PyLong_AS_LONG(v);
- if (scope != LOCAL && scope != LOCAL_ONLY)
+ if (scope != LOCAL)
continue;
if (!PySet_Contains(free, name))
continue;