Per discussion on python-dev, remove CO_GENERATOR_ALLOWED. Leave comment about not...

diff --git a/Include/code.h b/Include/code.h
index 1c8fbb36bd33f23a3d6cc9ddff56f7c1a3d539e8..7dd13fe5dae1b43c4ee72444e8953698f43e39e7 100644 (file)
--- a/Include/code.h
+++ b/Include/code.h
@@ -40,7 +40,10 @@ typedef struct {
 */
 #define CO_NOFREE       0x0040
 
-#define CO_GENERATOR_ALLOWED    0x1000 /* no longer used in an essential way */
+#if 0
+/* This is no longer used.  Stopped defining in 2.5, do not re-use. */
+#define CO_GENERATOR_ALLOWED    0x1000
+#endif
 #define CO_FUTURE_DIVISION     0x2000
 
 #define CO_MAXBLOCKS 20 /* Max static block nesting within a function */

diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 5c78cce60514ec970da439fff87ad938bb629360..446133a16ca0d097a90def21b886369d9ae6f4d0 100644 (file)
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -8,7 +8,7 @@ extern "C" {
 #endif
 
 #define PyCF_MASK (CO_FUTURE_DIVISION)
-#define PyCF_MASK_OBSOLETE (CO_GENERATOR_ALLOWED | CO_NESTED)
+#define PyCF_MASK_OBSOLETE (CO_NESTED)
 #define PyCF_SOURCE_IS_UTF8  0x0100
 #define PyCF_DONT_IMPLY_DEDENT 0x0200