From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jul 2009 21:44:01 +0000 (+0000)
Subject: the old CO_FUTURE flags can't be commented out
X-Git-Tag: v3.2a1~2902
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=466a7822c19d97223cf54549b247ce2c33685825;p=thirdparty%2FPython%2Fcpython.git

the old CO_FUTURE flags can't be commented out
---

diff --git a/Include/code.h b/Include/code.h
index 145a9a128b99..3ab5bc7eb4df 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 86d9fe2250c0..28e169060caf 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
diff --git a/Misc/NEWS b/Misc/NEWS
index f8b6bb557808..5d4c3ee7b80b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,11 @@ Core and Builtins
 
 - Issue #4856: Remove checks for win NT.
 
+C-API
+-----
+
+- The code flags for old __future__ features are now available again.
+
 Library
 -------