diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-06-28 03:18:59 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-06-28 03:18:59 (GMT) |
| commit | 876b2f286b9af1a69846c84d1229014b2a885c97 (patch) | |
| tree | 1934d1ce119603a4ae7a0a37c01957a3ca2d17a2 /Python/import.c | |
| parent | d2397753ee3d20579aa60b5e1c037e9e20db7ccb (diff) | |
| download | cpython-876b2f286b9af1a69846c84d1229014b2a885c97.zip cpython-876b2f286b9af1a69846c84d1229014b2a885c97.tar.gz cpython-876b2f286b9af1a69846c84d1229014b2a885c97.tar.bz2 | |
Merged revisions 72912,72920,72940 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72912 | benjamin.peterson | 2009-05-25 08:13:44 -0500 (Mon, 25 May 2009) | 5 lines
add a SETUP_WITH opcode
It speeds up the with statement and correctly looks up the special
methods involved.
........
r72920 | benjamin.peterson | 2009-05-25 15:12:57 -0500 (Mon, 25 May 2009) | 1 line
take into account the fact that SETUP_WITH pushes a finally block
........
r72940 | benjamin.peterson | 2009-05-26 07:49:59 -0500 (Tue, 26 May 2009) | 1 line
teach the peepholer about SETUP_WITH
........
Diffstat (limited to 'Python/import.c')
| -rw-r--r-- | Python/import.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/import.c b/Python/import.c index bccb971..23dd7b4 100644 --- a/Python/import.c +++ b/Python/import.c @@ -89,9 +89,10 @@ typedef unsigned short mode_t; change LIST_APPEND and SET_ADD, add MAP_ADD) Python 3.1a0: 3150 (optimize conditional branches: introduce POP_JUMP_IF_FALSE and POP_JUMP_IF_TRUE) + Python 3.2a0: 3160 (add SETUP_WITH) */ -#define MAGIC (3150 | ((long)'\r'<<16) | ((long)'\n'<<24)) +#define MAGIC (3160 | ((long)'\r'<<16) | ((long)'\n'<<24)) /* Magic word as global; note that _PyImport_Init() can change the value of this global to accommodate for alterations of how the compiler works which are enabled by command line switches. */ |