[pypy-commit] pypy py3k: try to fix what was broken after the merge because of the translation-cleanup branch

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r57738:f123c1cfc55b
Date: 2012-10-02 17:06 +0200
http://bitbucket.org/pypy/pypy/changeset/f123c1cfc55b/

Log:	try to fix what was broken after the merge because of the
	translation-cleanup branch

diff --git a/pypy/objspace/flow/bytecode.py b/pypy/objspace/flow/bytecode.py
--- a/pypy/objspace/flow/bytecode.py
+++ b/pypy/objspace/flow/bytecode.py
@@ -13,7 +13,7 @@
     """
     opnames = host_bytecode_spec.method_names
 
-    def __init__(self, space,  argcount, nlocals, stacksize, flags,
+    def __init__(self, space,  argcount, kwonlyargcount, nlocals, stacksize, flags,
                      code, consts, names, varnames, filename,
                      name, firstlineno, lnotab, freevars, cellvars,
                      hidden_applevel=False, magic=cpython_magic):
@@ -22,6 +22,8 @@
         self.co_name = name
         assert nlocals >= 0
         self.co_argcount = argcount
+        # note that this is ignored, as HostCode represents a python2 bytecode
+        self.co_kwonlyargcount = kwonlyargcount
         self.co_nlocals = nlocals
         self.co_stacksize = stacksize
         self.co_flags = flags
diff --git a/pypy/objspace/flow/flowcontext.py b/pypy/objspace/flow/flowcontext.py
--- a/pypy/objspace/flow/flowcontext.py
+++ b/pypy/objspace/flow/flowcontext.py
@@ -678,7 +678,7 @@
         w_exit = self.space.getattr(w_manager, self.space.wrap("__exit__"))
         self.settopvalue(w_exit)
         w_result = self.space.call_method(w_manager, "__enter__")
-        block = WithBlock(self.valuestackdepth,
+        block = WithBlock(self,
                           next_instr + offsettoend, self.lastblock)
         self.lastblock = block
         self.pushvalue(w_result)