Backport bugfixes from the trunk.

Only real change is to track movement of CO_ consts to here.

diff --git a/Tools/compiler/compiler/consts.py b/Tools/compiler/compiler/consts.py
index ae3d18d35dcdf1ed2f2e854bcceb3566064a175d..fdb0a745e0821777f013ab5d036a11806a299dd9 100644 (file)
--- a/Tools/compiler/compiler/consts.py
+++ b/Tools/compiler/compiler/consts.py
@@ -1,7 +1,3 @@
-# code flags
-CO_VARARGS = 1
-CO_VARKEYWORDS = 2
-
 # operation flags
 OP_ASSIGN = 'OP_ASSIGN'
 OP_DELETE = 'OP_DELETE'
@@ -12,3 +8,9 @@ SC_GLOBAL = 2
 SC_FREE = 3
 SC_CELL = 4
 SC_UNKNOWN = 5
+
+CO_OPTIMIZED = 0x0001
+CO_NEWLOCALS = 0x0002
+CO_VARARGS = 0x0004
+CO_VARKEYWORDS = 0x0008
+CO_NESTED = 0x0010