merge 3.3-slp (Stackless python#107)

Anselm Kruis · Anselm Kruis · commit e495a1278644 · 2016-12-20T11:52:43.000+01:00
diff --git a/Stackless/changelog.txt b/Stackless/changelog.txt
@@ -9,6 +9,10 @@ What's New in Stackless 3.X.X?
 
 *Release date: 20XX-XX-XX*
 
+- https://bitbucket.org/stackless-dev/stackless/issues/107
+  Improve unpickling of traceback objects. Stackless now reconstructs the
+  frame.f_back linkage in frames directly referenced by traceback objects.
+
 - https://bitbucket.org/stackless-dev/stackless/issues/110
   Remove the already non functional remains of psyco support.
 
diff --git a/Stackless/pickling/prickelpit.c b/Stackless/pickling/prickelpit.c
@@ -1206,6 +1206,14 @@ tb_setstate(PyObject *self, PyObject *args)
     tb->tb_lineno = lineno;
     Py_TYPE(tb) = Py_TYPE(tb)->tp_base;
 
+    if (frame != NULL && next != NULL && next->tb_frame != NULL &&
+        (PyObject *)(next->tb_frame->f_back) == Py_None) {
+        /* Reconstruct the f_back chain as far as possible. */
+        next->tb_frame->f_back = frame;
+        Py_INCREF(frame);
+        Py_DECREF(Py_None);
+    }
+
     Py_INCREF(self);
     return self;
 }
diff --git a/Stackless/unittests/test_pickle.py b/Stackless/unittests/test_pickle.py
@@ -3,6 +3,7 @@
 import unittest
 import pickle
 import gc
+import inspect
 
 from stackless import schedule, tasklet, stackless
 
@@ -606,6 +607,50 @@ class TestDictViewPicklingPy(AbstractTestPickledTasklets, DictViewPicklingTestCa
 class TestDictViewPicklingC(AbstractTestPickledTasklets, DictViewPicklingTestCases, CPickleMixin):
     pass
 
+
+class Traceback_TestCases(object):
+    def testTracebackFrameLinkage(self):
+        def a():
+            # raise an exception
+            1 // 0
+
+        def b():
+            return a()
+
+        def c():
+            return b()
+
+        try:
+            c()
+        except ZeroDivisionError:
+            tb = sys.exc_info()[2]
+
+        innerframes_orig = inspect.getinnerframes(tb)
+        p = self.dumps(tb)
+        tb2 = self.loads(p)
+        # basics
+        self.assertIs(type(tb), type(tb2))
+        self.assertIsNot(tb, tb2)
+        innerframes = inspect.getinnerframes(tb2)
+        # compare the content
+        self.assertListEqual([i[1:] for i in innerframes_orig], [i[1:] for i in innerframes])
+        # check linkage
+        all_outerframes_orig = inspect.getouterframes(innerframes_orig[-1][0])
+        all_outerframes = inspect.getouterframes(innerframes[-1][0])
+        l = len(innerframes_orig)
+        self.assertGreater(len(all_outerframes_orig), l)
+        self.assertGreaterEqual(len(all_outerframes), l)
+        # compare the content
+        self.assertListEqual([i[1:] for i in all_outerframes_orig[:l - 1]], [i[1:] for i in all_outerframes[:l - 1]])
+
+
+class TestTracebackPy(StacklessTestCase, Traceback_TestCases, PyPickleMixin):
+    pass
+
+
+class TestTracebackC(StacklessTestCase, Traceback_TestCases, CPickleMixin):
+    pass
+
 if __name__ == '__main__':
     if not sys.argv[1:]:
         sys.argv.append('-v')
