Issue #892902: Fixed pickling recursive objects.
diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py
index f6b3347..0a1eb43 100644
--- a/Lib/test/test_cpickle.py
+++ b/Lib/test/test_cpickle.py
@@ -1,6 +1,7 @@
import cPickle
import cStringIO
import io
+import functools
import unittest
from test.pickletester import (AbstractUnpickleTests,
AbstractPickleTests,
@@ -151,31 +152,6 @@
finally:
self.close(f)
- def test_recursive_list(self):
- self.assertRaises(ValueError,
- AbstractPickleTests.test_recursive_list,
- self)
-
- def test_recursive_tuple(self):
- self.assertRaises(ValueError,
- AbstractPickleTests.test_recursive_tuple,
- self)
-
- def test_recursive_inst(self):
- self.assertRaises(ValueError,
- AbstractPickleTests.test_recursive_inst,
- self)
-
- def test_recursive_dict(self):
- self.assertRaises(ValueError,
- AbstractPickleTests.test_recursive_dict,
- self)
-
- def test_recursive_multi(self):
- self.assertRaises(ValueError,
- AbstractPickleTests.test_recursive_multi,
- self)
-
def test_nonrecursive_deep(self):
# If it's not cyclic, it should pickle OK even if the nesting
# depth exceeds PY_CPICKLE_FAST_LIMIT. That happens to be
@@ -187,6 +163,19 @@
b = self.loads(self.dumps(a))
self.assertEqual(a, b)
+for name in dir(AbstractPickleTests):
+ if name.startswith('test_recursive_'):
+ func = getattr(AbstractPickleTests, name)
+ if '_subclass' in name and '_and_inst' not in name:
+ assert_args = RuntimeError, 'maximum recursion depth exceeded'
+ else:
+ assert_args = ValueError, "can't pickle cyclic objects"
+ def wrapper(self, func=func, assert_args=assert_args):
+ with self.assertRaisesRegexp(*assert_args):
+ func(self)
+ functools.update_wrapper(wrapper, func)
+ setattr(cPickleFastPicklerTests, name, wrapper)
+
class cStringIOCPicklerFastTests(cStringIOMixin, cPickleFastPicklerTests):
pass