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
........
diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py
index c874481..c63ca3e 100644
--- a/Lib/test/test_cpickle.py
+++ b/Lib/test/test_cpickle.py
@@ -107,7 +107,7 @@
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