From f747aa43081251915288902564151ec2d5bd469d Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Fri, 18 Dec 2009 20:23:24 +0000 Subject: [PATCH] Merged revisions 70531 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r70531 | benjamin.peterson | 2009-03-23 00:24:58 +0200 (Mon, 23 Mar 2009) | 1 line AttributeError can be thrown during recursion errors ........ --- Lib/test/test_cpickle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py index c874481cdd6..c63ca3e0f68 100644 --- a/Lib/test/test_cpickle.py +++ b/Lib/test/test_cpickle.py @@ -107,7 +107,7 @@ class cPickleDeepRecursive(unittest.TestCase): for n in nodes: n.connections = list(nodes) n.connections.remove(n) - self.assertRaises(RuntimeError, cPickle.dumps, n) + self.assertRaises((AttributeError, RuntimeError), cPickle.dumps, n) def test_issue3179(self): # Safe test, because I broke this case when fixing the