mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-13 06:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

[3.9] bpo-41840: Report module-level globals as both local and global in the symtable module (GH-22391). (GH-22528)

Browse source 
(cherry picked from commit fb0a4651f1)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
This commit is contained in:
Pablo Galindo 2020-10-03 21:23:03 +01:00 • committed by GitHub
parent e89253756c
commit 7b7aa94e51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/symtable.py
View file

@ -34,7 +34,7 @@ class SymbolTableFactory:
_newSymbolTable = SymbolTableFactory()
class SymbolTable(object):
class SymbolTable:
def __init__(self, raw_table, filename):
self._table = raw_table
@ -47,7 +47,7 @@ class SymbolTable(object):
else:
kind = "%s " % self.__class__.__name__
if self._table.name == "global":
if self._table.name == "top":
return "<{0}SymbolTable for module {1}>".format(kind, self._filename)
else:
return "<{0}SymbolTable for {1} in {2}>".format(kind,
@ -90,7 +90,9 @@ class SymbolTable(object):
if sym is None:
flags = self._table.symbols[name]
namespaces = self.__check_children(name)
sym = self._symbols[name] = Symbol(name, flags, namespaces)
module_scope = (self._table.name == "top")
sym = self._symbols[name] = Symbol(name, flags, namespaces,
module_scope=module_scope)
return sym
def get_symbols(self):
@ -163,13 +165,14 @@ class Class(SymbolTable):
return self.__methods
class Symbol(object):
class Symbol:
def __init__(self, name, flags, namespaces=None):
def __init__(self, name, flags, namespaces=None, *, module_scope=False):
self.__name = name
self.__flags = flags
self.__scope = (flags >> SCOPE_OFF) & SCOPE_MASK # like PyST_GetScope()
self.__namespaces = namespaces or ()
self.__module_scope = module_scope
def __repr__(self):
return "<symbol {0!r}>".format(self.__name)
@ -184,7 +187,10 @@ class Symbol(object):
return bool(self.__flags & DEF_PARAM)
def is_global(self):
return bool(self.__scope in (GLOBAL_IMPLICIT, GLOBAL_EXPLICIT))
"""Return *True* if the sysmbol is global.
"""
return bool(self.__scope in (GLOBAL_IMPLICIT, GLOBAL_EXPLICIT)
or (self.__module_scope and self.__flags & DEF_BOUND))
def is_nonlocal(self):
return bool(self.__flags & DEF_NONLOCAL)
@ -193,7 +199,10 @@ class Symbol(object):
return bool(self.__scope == GLOBAL_EXPLICIT)
def is_local(self):
return bool(self.__scope in (LOCAL, CELL))
"""Return *True* if the symbol is local.
"""
return bool(self.__scope in (LOCAL, CELL)
or (self.__module_scope and self.__flags & DEF_BOUND))
def is_annotated(self):
return bool(self.__flags & DEF_ANNOT)