Merge pull request RustPython#4351 from yt2b/fix_pysymbol

make `test_local` pass

Author: youknowone

Lib/test/test_symtable.py

@@ -128,8 +128,6 @@ def test_nonlocal(self):
         expected = ("some_var",)
         self.assertEqual(self.other_internal.get_nonlocals(), expected)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_local(self):
         self.assertTrue(self.spam.lookup("x").is_local())
         self.assertFalse(self.spam.lookup("bar").is_local())

compiler/codegen/src/symboltable.rs

@@ -150,7 +150,7 @@ impl Symbol {
     }
 
     pub fn is_local(&self) -> bool {
-        self.scope == SymbolScope::Local
+        matches!(self.scope, SymbolScope::Local | SymbolScope::Cell)
     }
 
     pub fn is_bound(&self) -> bool {

vm/src/stdlib/symtable.rs

@@ -89,6 +89,7 @@ mod symtable {
                         .filter(|table| table.name == name)
                         .cloned()
                         .collect(),
+                    is_top_scope: self.symtable.name == "top",
                 }
                 .into_ref(vm))
             } else {
@@ -123,6 +124,7 @@ mod symtable {
                             .filter(|&table| table.name == s.name)
                             .cloned()
                             .collect(),
+                        is_top_scope: self.symtable.name == "top",
                     })
                     .into_ref(vm)
                     .into()
@@ -154,6 +156,7 @@ mod symtable {
     struct PySymbol {
         symbol: Symbol,
         namespaces: Vec<SymbolTable>,
+        is_top_scope: bool,
     }
 
     impl fmt::Debug for PySymbol {
@@ -176,7 +179,7 @@ mod symtable {
 
         #[pymethod]
         fn is_local(&self) -> bool {
-            self.symbol.is_local()
+            self.symbol.is_local() || (self.is_top_scope && self.symbol.is_bound())
         }
 
         #[pymethod]