Changeset 388 for python/vendor/current/Lib/symtable.py

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Lib/symtable.py (modified) (5 diffs)

python/vendor/current/Lib/symtable.py

@@ -4 +4 @@
 from _symtable import (USE, DEF_GLOBAL, DEF_LOCAL, DEF_PARAM,
      DEF_IMPORT, DEF_BOUND, OPT_IMPORT_STAR, OPT_EXEC, OPT_BARE_EXEC,
-     SCOPE_OFF, SCOPE_MASK, FREE, GLOBAL_IMPLICIT, GLOBAL_EXPLICIT)
-
-import warnings
+     SCOPE_OFF, SCOPE_MASK, FREE, GLOBAL_IMPLICIT, GLOBAL_EXPLICIT, CELL, LOCAL)
+
 import weakref
 
@@ -12 +11 @@
 
 def symtable(code, filename, compile_type):
-    raw = _symtable.symtable(code, filename, compile_type)
-    for top in raw.itervalues():
-        if top.name == 'top':
-            break
+    top = _symtable.symtable(code, filename, compile_type)
     return _newSymbolTable(top, filename)
 
@@ -139 +135 @@
     def get_locals(self):
         if self.__locals is None:
-            self.__locals = self.__idents_matching(lambda x:x & DEF_BOUND)
+            locs = (LOCAL, CELL)
+            test = lambda x: ((x >> SCOPE_OFF) & SCOPE_MASK) in locs
+            self.__locals = self.__idents_matching(test)
         return self.__locals
 
@@ -192 +190 @@
         return bool(self.__scope in (GLOBAL_IMPLICIT, GLOBAL_EXPLICIT))
 
-    def is_vararg(self):
-        warnings.warn("is_vararg() is obsolete and will be removed",
-                      DeprecationWarning, 2)
-        return False
-
-    def is_keywordarg(self):
-        warnings.warn("is_keywordarg() is obsolete and will be removed",
-                      DeprecationWarning, 2)
-        return False
-
     def is_declared_global(self):
         return bool(self.__scope == GLOBAL_EXPLICIT)
@@ -216 +204 @@
     def is_assigned(self):
         return bool(self.__flags & DEF_LOCAL)
-
-    def is_in_tuple(self):
-        warnings.warn("is_in_tuple() is obsolete and will be removed",
-                      DeprecationWarning, 2)
 
     def is_namespace(self):