[pypy-svn] r78251 - in pypy/branch/fast-forward/pypy: annotation/test jit/codewriter/test jit/tool module/_ffi module/_ffi/test module/_winreg module/bz2 rlib/rsre

afa at codespeak.net afa at codespeak.net
Sun Oct 24 20:07:08 CEST 2010


Author: afa
Date: Sun Oct 24 20:07:06 2010
New Revision: 78251

Added:
   pypy/branch/fast-forward/pypy/jit/tool/pypytrace.vim
      - copied unchanged from r78250, pypy/trunk/pypy/jit/tool/pypytrace.vim
Modified:
   pypy/branch/fast-forward/pypy/annotation/test/test_annrpython.py
   pypy/branch/fast-forward/pypy/jit/codewriter/test/test_jtransform.py
   pypy/branch/fast-forward/pypy/module/_ffi/   (props changed)
   pypy/branch/fast-forward/pypy/module/_ffi/test/   (props changed)
   pypy/branch/fast-forward/pypy/module/_winreg/interp_winreg.py
   pypy/branch/fast-forward/pypy/module/bz2/interp_bz2.py
   pypy/branch/fast-forward/pypy/rlib/rsre/rsre_jit.py
Log:
Merge from trunk
78228:78250


Modified: pypy/branch/fast-forward/pypy/annotation/test/test_annrpython.py
==============================================================================
--- pypy/branch/fast-forward/pypy/annotation/test/test_annrpython.py	(original)
+++ pypy/branch/fast-forward/pypy/annotation/test/test_annrpython.py	Sun Oct 24 20:07:06 2010
@@ -1,4 +1,4 @@
-
+from __future__ import with_statement
 import autopath
 import py.test
 import sys

Modified: pypy/branch/fast-forward/pypy/jit/codewriter/test/test_jtransform.py
==============================================================================
--- pypy/branch/fast-forward/pypy/jit/codewriter/test/test_jtransform.py	(original)
+++ pypy/branch/fast-forward/pypy/jit/codewriter/test/test_jtransform.py	Sun Oct 24 20:07:06 2010
@@ -691,6 +691,7 @@
     class FakeJitDriverSD:
         index = 42
         class jitdriver:
+            active = True
             greens = ['green1', 'green2', 'voidgreen3']
             reds = ['red1', 'red2', 'voidred3']
     jd = FakeJitDriverSD()

Modified: pypy/branch/fast-forward/pypy/module/_winreg/interp_winreg.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_winreg/interp_winreg.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_winreg/interp_winreg.py	Sun Oct 24 20:07:06 2010
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from pypy.interpreter.baseobjspace import Wrappable
 from pypy.interpreter.baseobjspace import ObjSpace, W_Root
 from pypy.interpreter.gateway import interp2app

Modified: pypy/branch/fast-forward/pypy/module/bz2/interp_bz2.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/bz2/interp_bz2.py	(original)
+++ pypy/branch/fast-forward/pypy/module/bz2/interp_bz2.py	Sun Oct 24 20:07:06 2010
@@ -1,3 +1,4 @@
+from __future__ import with_statement
 from pypy.rpython.tool import rffi_platform as platform
 from pypy.rpython.lltypesystem import rffi
 from pypy.rpython.lltypesystem import lltype

Modified: pypy/branch/fast-forward/pypy/rlib/rsre/rsre_jit.py
==============================================================================
--- pypy/branch/fast-forward/pypy/rlib/rsre/rsre_jit.py	(original)
+++ pypy/branch/fast-forward/pypy/rlib/rsre/rsre_jit.py	Sun Oct 24 20:07:06 2010
@@ -2,7 +2,7 @@
 
 
 class RSreJitDriver(JitDriver):
-    active = False        # XXX temporary?
+    active = True
 
     def __init__(self, name, debugprint, **kwds):
         JitDriver.__init__(self, **kwds)



More information about the Pypy-commit mailing list