Mercurial > cpython-lru_cache-weakref

diff Python/import.c @ 54889:3aaf2e065db0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ........
author Benjamin Peterson <benjamin@python.org>
date Sun, 28 Jun 2009 03:18:59 +0000
parents 54e093bd887e
children c075b974c35c
line wrap: on
line diff
--- a/Python/import.c	Sat Jun 27 23:45:02 2009 +0000
+++ b/Python/import.c	Sun Jun 28 03:18:59 2009 +0000
@@ -89,9 +89,10 @@
 			   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. */