From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 18 Dec 2009 20:23:24 +0000 (+0000)
Subject: Merged revisions 70531 via svnmerge from
X-Git-Tag: v2.6.5rc1~264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f747aa43081251915288902564151ec2d5bd469d;p=python

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 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