the old CO_FUTURE flags can't be commented out

benjaminp · benjaminp · commit 466a7822c19d · 2009-07-02T21:44:01.000Z
diff --git a/Include/code.h b/Include/code.h
@@ -42,15 +42,13 @@ typedef struct {
 */
 #define CO_NOFREE       0x0040
 
-#if 0
 /* These are no longer used. */
 #define CO_GENERATOR_ALLOWED    0x1000
 #define CO_FUTURE_DIVISION    	0x2000
 #define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */
 #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
@@ -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
@@ -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
 -------
 
