diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-07-02 22:02:15 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-07-02 22:02:15 (GMT) |
| commit | e39d5d5f814756f66983b35b843bc00632a50451 (patch) | |
| tree | 64b408d5ca53ebd6ce17163e83b00895a2c8fd6e /Include | |
| parent | 7dfed63bcd76fc13838e205d0e3d04258f9fd372 (diff) | |
| download | cpython-e39d5d5f814756f66983b35b843bc00632a50451.zip cpython-e39d5d5f814756f66983b35b843bc00632a50451.tar.gz cpython-e39d5d5f814756f66983b35b843bc00632a50451.tar.bz2 | |
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
........
................
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/code.h | 4 | ||||
| -rw-r--r-- | Include/pythonrun.h | 6 |
2 files changed, 6 insertions, 4 deletions
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 @@ typedef struct { */ #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 diff --git a/Include/pythonrun.h b/Include/pythonrun.h index 86d9fe2..09d3ee5 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -7,8 +7,10 @@ extern "C" { #endif -#define PyCF_MASK CO_FUTURE_BARRY_AS_BDFL -#define PyCF_MASK_OBSOLETE 0 +#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 (CO_NESTED) #define PyCF_SOURCE_IS_UTF8 0x0100 #define PyCF_DONT_IMPLY_DEDENT 0x0200 #define PyCF_ONLY_AST 0x0400 |