[Python-checkins] r76877 - in python/branches/release26-maint: Lib/test/test_cpickle.py
ezio.melotti
python-checkins at python.org
Fri Dec 18 21:23:25 CET 2009
Author: ezio.melotti
Date: Fri Dec 18 21:23:24 2009
New Revision: 76877
Log:
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
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/test/test_cpickle.py
Modified: python/branches/release26-maint/Lib/test/test_cpickle.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_cpickle.py (original)
+++ python/branches/release26-maint/Lib/test/test_cpickle.py Fri Dec 18 21:23:24 2009
@@ -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
More information about the Python-checkins
mailing list