From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 6 Apr 2020 16:41:24 +0000 (-0700)
Subject: bpo-40196: Fix a bug in the symtable when reporting inspecting global variables ... 
X-Git-Tag: v3.7.8rc1~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=717f1668b3455b498424577e194719f9beae13a1;p=thirdparty%2FPython%2Fcpython.git

bpo-40196: Fix a bug in the symtable when reporting inspecting global variables (GH-19391)

(cherry picked from commit 799d7d61a91eb0ad3256ef9a45a90029cef93b7c)

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

diff --git a/Lib/symtable.py b/Lib/symtable.py
index c7627a6ef688..42ab72564536 100644
--- a/Lib/symtable.py
+++ b/Lib/symtable.py
@@ -188,7 +188,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 dfaee173ef72..aa99e86e4bce 100644
--- a/Lib/test/test_symtable.py
+++ b/Lib/test/test_symtable.py
@@ -92,10 +92,14 @@ 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_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
index 000000000000..c5fbd6e5ff3f
--- /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.