summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2009-12-18 20:23:24 +0000
committerEzio Melotti <ezio.melotti@gmail.com>2009-12-18 20:23:24 +0000
commitf747aa43081251915288902564151ec2d5bd469d (patch)
tree21ae255ab5ed43d08f4d491da0cdb68c26b2d876
parentae5657e1ffec42f075f93092a239052e33b951cb (diff)
downloadcpython-git-f747aa43081251915288902564151ec2d5bd469d.tar.gz
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 ........
-rw-r--r--Lib/test/test_cpickle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_cpickle.py b/Lib/test/test_cpickle.py
index c874481cdd..c63ca3e0f6 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