mirror of https://github.com/python/cpython
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 ........
This commit is contained in:
parent
7497e91a20
commit
f76942d6bf
|
@ -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.
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue