summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-02-25 15:43:10 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-02-25 15:43:10 (GMT)
commitab51f5f24d6f6edef5e8fac5e31b2e4ac0cbdbac (patch)
tree038506090aedd7ce81a52cf7c481b0633746fb36
parentdf95cb6ae31d381aaed4f41f73c9b9a2569f2640 (diff)
downloadcpython-ab51f5f24d6f6edef5e8fac5e31b2e4ac0cbdbac.zip
cpython-ab51f5f24d6f6edef5e8fac5e31b2e4ac0cbdbac.tar.gz
cpython-ab51f5f24d6f6edef5e8fac5e31b2e4ac0cbdbac.tar.bz2
Per discussion on python-dev, remove CO_GENERATOR_ALLOWED. Leave comment about not removing yet.
-rw-r--r--Include/code.h5
-rw-r--r--Include/pythonrun.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/Include/code.h b/Include/code.h
index 1c8fbb3..7dd13fe 100644
--- 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 5c78cce..446133a 100644
--- 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