[pypy-commit] pypy py3k: readd for_hidden from default

[pjenvey]

Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r83958:402867a81fa5
Date: 2016-04-26 21:48 -0700
http://bitbucket.org/pypy/pypy/changeset/402867a81fa5/

Log:    readd for_hidden from default

diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -4,7 +4,7 @@
 from rpython.rlib import jit
 from rpython.rlib.debug import make_sure_not_resized, check_nonneg
 from rpython.rlib.jit import hint
-from rpython.rlib.objectmodel import instantiate, we_are_translated
+from rpython.rlib.objectmodel import instantiate, specialize, we_are_translated
 from rpython.rlib.rarithmetic import intmask, r_uint
 from rpython.tool.pairtype import extendabletype
 
@@ -872,7 +872,8 @@
         return space.w_False
 
     @jit.unroll_safe
-    def _exc_info_unroll(self, space):
+    @specialize.arg(2)
+    def _exc_info_unroll(self, space, for_hidden=False):
         """Return the most recent OperationError being handled in the
         call stack
         """
@@ -882,7 +883,7 @@
             if last is not None:
                 if last is get_cleared_operation_error(self.space):
                     break
-                if not frame.hide():
+                if for_hidden or not frame.hide():
                     return last
             frame = frame.f_backref()
         return None
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit