bpo-40196: Fix a bug in the symtable when reporting inspecting global variables ...

(cherry picked from commit 799d7d61a91eb0ad3256ef9a45a90029cef93b7c)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

diff --git a/Lib/symtable.py b/Lib/symtable.py
index 5bea7cf6155486907c532af2aab26ae1dc339bfa..ac0a64ff58f795ad1a50aa750f2703136e01bf64 100644 (file)
--- a/Lib/symtable.py
+++ b/Lib/symtable.py
@@ -197,7 +197,7 @@ class Symbol(object):
         return bool(self.__scope == GLOBAL_EXPLICIT)
 
     def is_local(self):
-        return bool(self.__flags & DEF_BOUND)
+        return bool(self.__scope in (LOCAL, CELL))
 
     def is_annotated(self):
         return bool(self.__flags & DEF_ANNOT)

diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py
index bea2ce120ca96b43400068506bbcc9f8e07bcc02..98d718c8ab1b1efe9471639a432b7c55ca6ec8c6 100644 (file)
--- a/Lib/test/test_symtable.py
+++ b/Lib/test/test_symtable.py
@@ -99,6 +99,7 @@ class SymtableTest(unittest.TestCase):
         self.assertTrue(self.spam.lookup("bar").is_declared_global())
         self.assertFalse(self.internal.lookup("x").is_global())
         self.assertFalse(self.Mine.lookup("instance_var").is_global())
+        self.assertTrue(self.spam.lookup("bar").is_global())
 
     def test_nonlocal(self):
         self.assertFalse(self.spam.lookup("some_var").is_nonlocal())
@@ -108,7 +109,10 @@ class SymtableTest(unittest.TestCase):
 
     def test_local(self):
         self.assertTrue(self.spam.lookup("x").is_local())
-        self.assertFalse(self.internal.lookup("x").is_local())
+        self.assertFalse(self.spam.lookup("bar").is_local())
+
+    def test_free(self):
+        self.assertTrue(self.internal.lookup("x").is_free())
 
     def test_referenced(self):
         self.assertTrue(self.internal.lookup("x").is_referenced())

diff --git a/Misc/NEWS.d/next/Library/2020-04-06-11-05-13.bpo-40196.Jqowse.rst b/Misc/NEWS.d/next/Library/2020-04-06-11-05-13.bpo-40196.Jqowse.rst
new file mode 100644 (file)
index 0000000..c5fbd6e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-04-06-11-05-13.bpo-40196.Jqowse.rst
@@ -0,0 +1,2 @@
+Fix a bug in the :mod:`symtable` module that was causing incorrectly report
+global variables as local. Patch by Pablo Galindo.