Changeset 391 for python/trunk/Lib/compiler/symbols.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/compiler/symbols.py (modified) (4 diffs)

python/trunk/Lib/compiler/symbols.py

@@ -2 +2 @@
 
 from compiler import ast
-from compiler.consts import SC_LOCAL, SC_GLOBAL, SC_FREE, SC_CELL, SC_UNKNOWN
+from compiler.consts import SC_LOCAL, SC_GLOBAL_IMPLICIT, SC_GLOBAL_EXPLICIT, \
+    SC_FREE, SC_CELL, SC_UNKNOWN
 from compiler.misc import mangle
 import types
@@ -90 +91 @@
         """
         if name in self.globals:
-            return SC_GLOBAL
+            return SC_GLOBAL_EXPLICIT
         if name in self.cells:
             return SC_CELL
@@ -100 +101 @@
             return SC_UNKNOWN
         else:
-            return SC_GLOBAL
+            return SC_GLOBAL_IMPLICIT
 
     def get_free_vars(self):
@@ -153 +154 @@
                    or isinstance(self, ClassScope):
                     self.frees[name] = 1
-                elif sc == SC_GLOBAL:
+                elif sc == SC_GLOBAL_IMPLICIT:
                     child_globals.append(name)
                 elif isinstance(self, FunctionScope) and sc == SC_LOCAL: