revert to using SCOPE_OFF

python · JelleZijlstra · Jun 12, 2024 · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024
commit 388e40e22114942c11d67e677a24889bb0dbbbb0
diff --git a/Lib/symtable.py b/Lib/symtable.py
@@ -8,16 +8,14 @@
     DEF_FREE, DEF_FREE_CLASS,
     DEF_IMPORT, DEF_BOUND, DEF_ANNOT,
     DEF_COMP_ITER, DEF_COMP_CELL,
-    SCOPE_OFFSET, SCOPE_MASK,
+    SCOPE_OFF, SCOPE_MASK,
     FREE, LOCAL, GLOBAL_IMPLICIT, GLOBAL_EXPLICIT, CELL
 )
 
 import weakref
 
 __all__ = ["symtable", "SymbolTable", "Class", "Function", "Symbol"]
 
-SCOPE_OFF = SCOPE_OFFSET  # kept for backward compatibility
-
 
 def symtable(code, filename, compile_type):
     """ Return the toplevel *SymbolTable* for the source code.
@@ -165,7 +163,7 @@ def get_children(self):
 
 
 def _get_scope(flags):  # like _PyST_GetScope()
-    return (flags >> SCOPE_OFFSET) & SCOPE_MASK
+    return (flags >> SCOPE_OFF) & SCOPE_MASK
 
 
 class Function(SymbolTable):

diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c
@@ -105,7 +105,7 @@ symtable_init_constants(PyObject *m)
     if (PyModule_AddIntMacro(m, FREE) < 0) return -1;
     if (PyModule_AddIntMacro(m, CELL) < 0) return -1;
 
-    if (PyModule_AddIntMacro(m, SCOPE_OFFSET) < 0) return -1;
+    if (PyModule_AddIntConstant(m, "SCOPE_OFF", SCOPE_OFFSET) < 0) return -1;
     if (PyModule_AddIntMacro(m, SCOPE_MASK) < 0) return -1;
 
     return 0;