summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-07-02 21:44:01 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-07-02 21:44:01 (GMT)
commit466a7822c19d97223cf54549b247ce2c33685825 (patch)
treed64d6e6640c07c3b18f405b85c43d8faa66ef9b0 /Include
parentc963731bb68b844e839518af96d8b986cbbf9da9 (diff)
downloadcpython-466a7822c19d97223cf54549b247ce2c33685825.zip
cpython-466a7822c19d97223cf54549b247ce2c33685825.tar.gz
cpython-466a7822c19d97223cf54549b247ce2c33685825.tar.bz2
the old CO_FUTURE flags can't be commented out
Diffstat (limited to 'Include')
-rw-r--r--Include/code.h2
-rw-r--r--Include/pythonrun.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/Include/code.h b/Include/code.h
index 145a9a1..3ab5bc7 100644
--- a/Include/code.h
+++ b/Include/code.h
@@ -42,7 +42,6 @@ typedef struct {
*/
#define CO_NOFREE 0x0040
-#if 0
/* These are no longer used. */
#define CO_GENERATOR_ALLOWED 0x1000
#define CO_FUTURE_DIVISION 0x2000
@@ -50,7 +49,6 @@ typedef struct {
#define CO_FUTURE_WITH_STATEMENT 0x8000
#define CO_FUTURE_PRINT_FUNCTION 0x10000
#define CO_FUTURE_UNICODE_LITERALS 0x20000
-#endif
#define CO_FUTURE_BARRY_AS_BDFL 0x40000
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 86d9fe2..28e1690 100644
--- a/Include/pythonrun.h
+++ b/Include/pythonrun.h
@@ -7,7 +7,9 @@
extern "C" {
#endif
-#define PyCF_MASK CO_FUTURE_BARRY_AS_BDFL
+#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
+ CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \
+ CO_FUTURE_UNICODE_LITERALS | CO_FUTURE_BARRY_AS_BDFL)
#define PyCF_MASK_OBSOLETE 0
#define PyCF_SOURCE_IS_UTF8 0x0100
#define PyCF_DONT_IMPLY_DEDENT 0x0200