Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r83930:16d67272ece0
Date: 2016-04-25 18:23 -0700
http://bitbucket.org/pypy/pypy/changeset/16d67272ece0/
Log: fix
diff --git a/pypy/interpreter/executioncontext.py
b/pypy/interpreter/executioncontext.py
--- a/pypy/interpreter/executioncontext.py
+++ b/pypy/interpreter/executioncontext.py
@@ -218,9 +218,6 @@
"""Implements sys.exc_info().
Return an OperationError instance or None.
- Ignores exceptions within hidden frames unless for_hidden=True
- is specified.
-
# NOTE: the result is not the wrapped sys.exc_info() !!!
"""
diff --git a/pypy/module/exceptions/interp_exceptions.py
b/pypy/module/exceptions/interp_exceptions.py
--- a/pypy/module/exceptions/interp_exceptions.py
+++ b/pypy/module/exceptions/interp_exceptions.py
@@ -191,11 +191,12 @@
last_operr = None
w_traceback = self.w_traceback
if w_traceback is not None and isinstance(w_traceback, PyTraceback):
- ec = space.getexecutioncontext()
# search for __context__ beginning in the previous frame. A
# __context__ from the top most frame would have already
# been handled by OperationError.record_context
- last_operr = ec.last_operr(space, w_traceback.frame.f_backref())
+ frame = w_traceback.frame.f_backref()
+ if frame:
+ last_operr = frame._exc_info_unroll(space)
if last_operr is None:
# no __context__
return space.w_None
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
