commit e39d5d5f814756f66983b35b843bc00632a50451
author Benjamin Peterson <benjamin@python.org> Thu Jul 02 22:02:15 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Thu Jul 02 22:02:15 2009 +0000
tree 64b408d5ca53ebd6ce17163e83b00895a2c8fd6e
parent 7dfed63bcd76fc13838e205d0e3d04258f9fd372

Merged revisions 73782-73784 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73782 | benjamin.peterson | 2009-07-02 16:44:01 -0500 (Thu, 02 Jul 2009) | 1 line

  the old CO_FUTURE flags can't be commented out
................
  r73783 | benjamin.peterson | 2009-07-02 16:54:36 -0500 (Thu, 02 Jul 2009) | 1 line

  a little more fiddling to make flags like 2.x
................
  r73784 | benjamin.peterson | 2009-07-02 16:55:39 -0500 (Thu, 02 Jul 2009) | 9 lines

  Merged revisions 73781 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73781 | benjamin.peterson | 2009-07-02 16:38:36 -0500 (Thu, 02 Jul 2009) | 1 line

    test that compile() accepts the future flag
  ........
................

Include/code.h

diff --git a/Include/code.h b/Include/code.h
index 145a9a1..efaf3c4 100644
--- a/Include/code.h
+++ b/Include/code.h
@@ -42,15 +42,15 @@
 */
 #define CO_NOFREE       0x0040
 
-#if 0
 /* These are no longer used. */
+#if 0
 #define CO_GENERATOR_ALLOWED    0x1000
+#endif
 #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