[pypy-svn] pypy default: "Fast" pickling has no memo, so it raises an exception with recursive structure.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r41604:3ddf0b03e02f
Date: 2011-02-04 12:01 +0100
http://bitbucket.org/pypy/pypy/changeset/3ddf0b03e02f/

Log:	"Fast" pickling has no memo, so it raises an exception with
	recursive structure. CPython raises ValueError, PyPy raises
	RuntimeError.

diff --git a/lib-python/modified-2.7.0/test/test_cpickle.py b/lib-python/modified-2.7.0/test/test_cpickle.py
--- a/lib-python/modified-2.7.0/test/test_cpickle.py
+++ b/lib-python/modified-2.7.0/test/test_cpickle.py
@@ -61,27 +61,27 @@
     error = cPickle.BadPickleGet
 
     def test_recursive_list(self):
-        self.assertRaises(ValueError,
+        self.assertRaises((ValueError, RuntimeError),
                           AbstractPickleTests.test_recursive_list,
                           self)
 
     def test_recursive_tuple(self):
-        self.assertRaises(ValueError,
+        self.assertRaises((ValueError, RuntimeError),
                           AbstractPickleTests.test_recursive_tuple,
                           self)
 
     def test_recursive_inst(self):
-        self.assertRaises(ValueError,
+        self.assertRaises((ValueError, RuntimeError),
                           AbstractPickleTests.test_recursive_inst,
                           self)
 
     def test_recursive_dict(self):
-        self.assertRaises(ValueError,
+        self.assertRaises((ValueError, RuntimeError),
                           AbstractPickleTests.test_recursive_dict,
                           self)
 
     def test_recursive_multi(self):
-        self.assertRaises(ValueError,
+        self.assertRaises((ValueError, RuntimeError),
                           AbstractPickleTests.test_recursive_multi,
                           self)