[pypy-commit] pypy py3.5: Merge heads

[rmariano]

Author: Mariano Anaya <marianoanaya at gmail.com>
Branch: py3.5
Changeset: r91893:6de61c965087
Date: 2017-07-16 14:18 +0200
http://bitbucket.org/pypy/pypy/changeset/6de61c965087/

Log:	Merge heads

diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -15,9 +15,9 @@
 
 
 class __extend__(PyFrame):
-    def execute_frame(self, w_inputvalue=None, operr=None):
+    def execute_frame(self, in_generator=None, w_arg_or_err=None):
         # indirection for the optional arguments
-        return my_execute_frame(self, w_inputvalue, operr)
+        return my_execute_frame(self, in_generator, w_arg_or_err)
 
 
 def _safe(s):