Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r93451:b1f6c07626d3
Date: 2017-12-17 21:23 +0000
http://bitbucket.org/pypy/pypy/changeset/b1f6c07626d3/
Log: fix translation
diff --git a/pypy/module/_continuation/interp_pickle.py
b/pypy/module/_continuation/interp_pickle.py
--- a/pypy/module/_continuation/interp_pickle.py
+++ b/pypy/module/_continuation/interp_pickle.py
@@ -2,10 +2,9 @@
from rpython.rlib import jit
from pypy.interpreter.error import OperationError
from pypy.interpreter.pyframe import PyFrame
-from pypy.module._continuation.interp_continuation import State, global_state
-from pypy.module._continuation.interp_continuation import build_sthread
-from pypy.module._continuation.interp_continuation import post_switch
-from pypy.module._continuation.interp_continuation import get_result, geterror
+from pypy.module._continuation.interp_continuation import (
+ State, global_state, build_sthread, pre_switch, post_switch,
+ get_result, geterror)
def getunpickle(space):
@@ -65,9 +64,10 @@
if self.bottomframe is None:
w_result = space.w_None
else:
+ saved_exception = pre_switch(sthread)
h = sthread.switch(self.h)
try:
- w_result = post_switch(sthread, h)
+ w_result = post_switch(sthread, h, saved_exception)
operr = None
except OperationError as e:
w_result = None
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
