Author: Armin Rigo <[email protected]>
Branch: py3.5
Changeset: r88478:8f84fd21ab98
Date: 2016-11-19 17:06 +0100
http://bitbucket.org/pypy/pypy/changeset/8f84fd21ab98/
Log: Fix for __pypy__.test.test_special.test_hidden_applevel_frame:
hidden frames should simply not record their exception in
sys_exc_info.
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -757,7 +757,8 @@
block = SysExcInfoRestorer(last_exception, self.lastblock)
self.lastblock = block
if operationerr is not None: # otherwise, don't change sys_exc_info
- ec.set_sys_exc_info(operationerr)
+ if not self.hide():
+ ec.set_sys_exc_info(operationerr)
def end_finally(self):
# unlike CPython, there are two statically distinct cases: the
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
