diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-10-16 03:51:38 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-10-16 03:51:38 (GMT) |
| commit | f76942d6bf432d6881dc47070002d226e1e15ce9 (patch) | |
| tree | ad2b0f7773a5c0e64d96016472b670c72cd449f1 | |
| parent | 7497e91a20104bd1ff9cc784a6877f8b8403e53d (diff) | |
| download | cpython-f76942d6bf432d6881dc47070002d226e1e15ce9.zip cpython-f76942d6bf432d6881dc47070002d226e1e15ce9.tar.gz cpython-f76942d6bf432d6881dc47070002d226e1e15ce9.tar.bz2 | |
Merged revisions 85562 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85562 | benjamin.peterson | 2010-10-15 22:45:45 -0500 (Fri, 15 Oct 2010) | 1 line
don't identify the toplevel namespace by name #9997
........
| -rw-r--r-- | Lib/test/test_scope.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/symtable.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Lib/test/test_scope.py b/Lib/test/test_scope.py index b1549ef..ab9e812 100644 --- a/Lib/test/test_scope.py +++ b/Lib/test/test_scope.py @@ -647,6 +647,13 @@ result2 = h() self.assertEqual(2, global_ns["result2"]) self.assertEqual(9, global_ns["result9"]) + def testTopIsNotSignificant(self): + # See #9997. + def top(a): + pass + def b(): + global a + def test_main(): with check_warnings(("import \* only allowed at module level", @@ -10,6 +10,9 @@ What's New in Python 2.7.1? Core and Builtins ----------------- +- Issue #9997: Don't let the name "top" have special significance in scope + resolution. + - Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as the default 512 when compiling on AIX. diff --git a/Python/symtable.c b/Python/symtable.c index 98d1e11..c18b39e 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -847,7 +847,7 @@ symtable_enter_block(struct symtable *st, identifier name, _Py_block_ty block, st->st_cur = ste_new(st, name, block, ast, lineno); if (st->st_cur == NULL) return 0; - if (name == GET_IDENTIFIER(top)) + if (block == ModuleBlock) st->st_global = st->st_cur->ste_symbols; if (prev) { if (PyList_Append(prev->ste_children, |