Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r71352:09705ecd0b75
Date: 2014-05-06 15:24 -0700
http://bitbucket.org/pypy/pypy/changeset/09705ecd0b75/

Log:    adapt d083e472a6ab to py3k: treat get_cleared_operation_error as if
        it was no exception here too

diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -52,7 +52,8 @@
     def setup_context(self, space):
         # Implicit exception chaining
         last_operror = space.getexecutioncontext().sys_exc_info()
-        if last_operror is None:
+        if (last_operror is None or
+            last_operror is get_cleared_operation_error(space)):
             return
 
         # We must normalize the value right now to check for cycles
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to