[Python-checkins] r85564 - in python/branches/release27-maint: Lib/test/test_scope.py Misc/NEWS Python/symtable.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Oct 16 05:51:38 2010
New Revision: 85564

Log:
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
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_scope.py
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Python/symtable.c

Modified: python/branches/release27-maint/Lib/test/test_scope.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_scope.py	(original)
+++ python/branches/release27-maint/Lib/test/test_scope.py	Sat Oct 16 05:51:38 2010
@@ -647,6 +647,13 @@
         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",

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Oct 16 05:51:38 2010
@@ -10,6 +10,9 @@
 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.
 

Modified: python/branches/release27-maint/Python/symtable.c
==============================================================================
--- python/branches/release27-maint/Python/symtable.c	(original)
+++ python/branches/release27-maint/Python/symtable.c	Sat Oct 16 05:51:38 2010
@@ -847,7 +847,7 @@
     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,